diff --git a/.gitignore b/.gitignore
index 606e522a3..b4dfddcac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ Thumbs.db
 !supportlibs/libsam3/Makefile
 
 # QtCreator cruft
-*CMakeLists.txt.user*
+*CMakeLists.txt.user
 
 # Build artifacts
 /jsonapi-generator/src/jsonapi-generator
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45fed1bb2..c91f867a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
-image: docker:latest
+image: docker:stable
 
 services:
-  - docker:dind
+  - docker:stable-dind
 
 stages:
   - build
@@ -18,7 +18,6 @@ variables:
 build-ubuntu-test-image:
     stage: build
     script:
-        - docker --version
         - > 
           docker login "$CI_REGISTRY"
           --username "$CI_REGISTRY_USER"
@@ -36,7 +35,6 @@ build-ubuntu-test-image:
 test-ubuntu:
     stage: test
     script:
-        - docker --version
         - > 
           docker login "$CI_REGISTRY"
           --username "$CI_REGISTRY_USER"
diff --git a/.gitmodules b/.gitmodules
index 273336f84..7692f4556 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,8 +36,3 @@
 [submodule "retroshare-webui"]
 	path = retroshare-webui
 	url = https://github.com/RetroShare/RSNewWebUI.git
-	branch = master
-[submodule "supportlibs/librnp"]
-	path = supportlibs/librnp
-	url = https://github.com/rnpgp/rnp.git
-	branch = main
diff --git a/README.asciidoc b/README.asciidoc
index 6e5c52ce9..e1f41e74d 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -7,9 +7,6 @@ RetroShare is a decentralized, private, secure, cross-platform, communication
 toolkit.
 RetroShare provides file sharing, chat, messages, forums, channels and more.
 
-|===============================================================================
-| Developer Documentation | image:https://deepwiki.com/badge.svg[link="https://deepwiki.com/RetroShare/RetroShare",title="Ask DeepWiki"]
-|===============================================================================
 .Build Status
 |===============================================================================
 |GNU/Linux (via Gitlab CI) | image:https://gitlab.com/RetroShare/RetroShare/badges/master/pipeline.svg[link="https://gitlab.com/RetroShare/RetroShare/-/commits/master",title="pipeline status"]
diff --git a/RetroShare.pro b/RetroShare.pro
index 4972fe2ab..944e8204e 100644
--- a/RetroShare.pro
+++ b/RetroShare.pro
@@ -25,6 +25,9 @@ CONFIG += c++14
 
 TEMPLATE = subdirs
 
+SUBDIRS += openpgpsdk
+openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro
+
 rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
     SUBDIRS += jsonapi-generator
     jsonapi-generator.file = jsonapi-generator/src/jsonapi-generator.pro
@@ -33,7 +36,7 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
 
 SUBDIRS += libbitdht
 libbitdht.file = libbitdht/src/libbitdht.pro
-libretroshare.depends += libbitdht
+libretroshare.depends += openpgpsdk libbitdht
 
 SUBDIRS += libretroshare
 libretroshare.file = libretroshare/src/libretroshare.pro
diff --git a/build_scripts/GitlabCI/base.Dockerfile b/build_scripts/GitlabCI/base.Dockerfile
index 5fd1bd81d..13097f58d 100644
--- a/build_scripts/GitlabCI/base.Dockerfile
+++ b/build_scripts/GitlabCI/base.Dockerfile
@@ -40,23 +40,18 @@ RUN git clone --depth 1 https://github.com/aetilius/pHash.git && \
 	rm -rf pHash-build pHash
 
 ARG FRESHCLONE=0
-ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 ARG REPO_DEPTH="--depth 2000"
-RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && \
-	cd RetroShare && \
+RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && cd RetroShare && \
 	git fetch --tags && \
-	git submodule update --init \
-		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ \
-		supportlibs/restbed/ && \
-	cd supportlibs/restbed/ && \
-	git submodule update --init \
-		dependency/asio/ dependency/kashmir/ && \
-	cd ../../../
+	git submodule update --init --remote --force \
+		libbitdht/ libretroshare/ openpgpsdk/ && \
+	cd ..
 
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON && \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON && \
 	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build
diff --git a/build_scripts/GitlabCI/gitlabCI.Dockerfile b/build_scripts/GitlabCI/gitlabCI.Dockerfile
index 5ae3f4ed3..c62c4d198 100644
--- a/build_scripts/GitlabCI/gitlabCI.Dockerfile
+++ b/build_scripts/GitlabCI/gitlabCI.Dockerfile
@@ -2,19 +2,19 @@ FROM registry.gitlab.com/retroshare/retroshare:base
 
 RUN apt-get update -y && apt-get upgrade -y
 
-ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 RUN \
 	cd RetroShare && git remote add testing $REPO_URL && \
 	git fetch --tags testing $REPO_BRANCH && \
 	git reset --hard testing/$REPO_BRANCH && \
-	git submodule update --init \
-		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ && \
+	git submodule update --init --remote --force \
+		libbitdht/ libretroshare/ openpgpsdk/ && \
 	git --no-pager log --max-count 1
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
 	cmake -B. -S../RetroShare/retroshare-service \
-		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON \
 		-DRS_WARN_DEPRECATED=OFF -DRS_WARN_LESS=ON && \
 	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build
diff --git a/build_scripts/OBS b/build_scripts/OBS
index 0a3997cc1..353596b0e 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit 0a3997cc1355b2c848161dca015b7e2df039707b
+Subproject commit 353596b0ee5ea76611eb663b90bf3ab1c9f34ad7
diff --git a/build_scripts/OSX/MacOS_X_InstallGuide.md b/build_scripts/OSX/MacOS_X_InstallGuide.md
index b63b12185..6dafd63c0 100644
--- a/build_scripts/OSX/MacOS_X_InstallGuide.md
+++ b/build_scripts/OSX/MacOS_X_InstallGuide.md
@@ -2,15 +2,13 @@
 
 ## Qt Installation
 
-Qt 5.15 is not available as install package.
+Install Qt via: [Qt Download](http://www.qt.io/download/)
 
-Download Qt 5.15.x from here: [Qt 5.15.17](https://download.qt.io/archive/qt/5.15/5.15.17/single/qt-everywhere-opensource-src-5.15.17.tar.xz)
+Use default options. And add Qt Script support.
 
-Instruction howto Build Qt 5.15.x on macOS: [macOS Building](https://doc.qt.io/archives/qt-5.15/macos-building.html)
-## Set the Environment Variables
 Add to the PATH environment variable by editing your *~/.profile* file.
 
-       export PATH="/users/$USER/Qt/5.15.17/clang_64/bin:$PATH"
+       export PATH="/users/$USER/Qt/5.14.1/clang_64/bin:$PATH"
 
 Depends on which version of Qt you use.
 
@@ -32,20 +30,32 @@ In GitHub Desktop -> Clone Repository -> URL
 
        Add Repository URL: https://github.com/RetroShare/RetroShare.git and Clone
 
-## ***Get XCode & MacOSX SDK***
+## ***Choose if you use MacPort or HomeBrew***
 
-To identify the correct version of Xcode to install, you need to know which OS you are running. Go to the [x] menu -> "About This Mac" and read the macOS version number.
+### MacPort Installation
 
-If you are running macOS Ventura 13.5 or later, you can install Xcode directly from App Store using the instructions below. 
+Install MacPort and XCode following this guide: [MacPort and XCode](http://guide.macports.org/#installing.xcode)
 
-You can find older versions of Xcode at [Apple Developer Downloads](https://developer.apple.com/downloads/). Find the appropriate .xip file for your macOS version
+Start XCode to get it updated and to able C compiler to create executables.
 
-To install from App Store:
+#### Install libraries  
 
-Select [x] menu - > "App Store…".
-Search for Xcode. Download and install.
+       $ sudo port -v selfupdate
+       $ sudo port install openssl
+       $ sudo port install miniupnpc
+       $ sudo port install libmicrohttpd
+       
+For VOIP Plugin: 
 
-Once Xcode has installed, you must drag the XCode icon into your Applications folder. After you have done this, open Xcode from the Applications folder by double-clicking on the icon and then follow the remaining instructions below. 
+       $ sudo port install speex-devel
+       $ sudo port install opencv
+       $ sudo port install ffmpeg
+
+Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
+
+### HOMEBREW Installation
+
+Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)
 
 Install XCode command line developer tools:
 
@@ -53,33 +63,13 @@ Install XCode command line developer tools:
 
 Start XCode to get it updated and to able C compiler to create executables.
 
-Older MacOSX SDK is available from here: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
-
-### MacPort Installation
-
-Install MacPort following this guide: [MacPort](http://guide.macports.org/#installing.xcode)
-
-### HOMEBREW Installation
-
-Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)
-
 #### Install libraries  
 
        $ brew install openssl
        $ brew install miniupnpc
+       $ brew install libmicrohttpd
        $ brew install rapidjson
        $ brew install sqlcipher
-
-For RNP lib:
-
-	   $ brew install bzip2
-	   $ brew install zlib
-	   $ brew install json-c
-	   $ brew install botan@2
-
-#### Install CMake 
-
-       $ brew install cmake
        
 If you have error in linking, run this:
 
@@ -95,7 +85,8 @@ For VOIP Plugin:
 For FeedReader Plugin:
 
        $ brew install libxslt
-       $ brew install libxml2
+
+Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
 
 ## Last Settings
 
@@ -113,8 +104,11 @@ In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additiona
 
 ## Set your Mac OS SDK version
 
+Edit RetroShare.pro  
 
-Edit retroshare.pri and set your installed sdk version example for 11.1 -> rs_macos11.1 (line 135:)
+    CONFIG += c++14 rs_macos11.1
+
+and then retroshare.pri
 
     macx:CONFIG *= rs_macos11.1
     rs_macos10.8:CONFIG -= rs_macos11.1
@@ -128,7 +122,7 @@ Edit retroshare.pri and set your installed sdk version example for 11.1 -> rs_ma
 
 ## Link Include & Libraries
 
-When required edit your retroshare.pri macx-* section, check if the Include and Lib path are correct (macx-* section)
+Edit your retroshare.pri and add to macx-*  section
 
     INCLUDEPATH += "/usr/local/opt/openssl/include"
     QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"
@@ -137,21 +131,13 @@ When required edit your retroshare.pri macx-* section, check if the Include and
 
 alternative via Terminal
 
-    $ qmake 
-    INCLUDEPATH+="/usr/local/opt/openssl/include" \
-    QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
-    QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" \
-    QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" \
-    CONFIG+=rs_autologin \
-    CONFIG+=rs_use_native_dialogs \
-    CONFIG+=release \
-    ..
+    $ qmake INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib"
 
 For FeedReader Plugin:
 
     INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2"
 
-With plugins:
+For building RetroShare with plugins:
 
     $ qmake \
     INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
@@ -173,30 +159,13 @@ With plugins:
 
 You can now compile RetroShare into Qt Creator or with Terminal
 
-       $ cd /path/to/retroshare
-       $ qmake ..
-       $ make
+       cd retroshare
+       qmake; make
 
 You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK
 
 You can find the compiled application at *./retroshare/retroshare-gui/src/retroshare.app*
 
-## Issues
-
-If you have issues with openssl (Undefined symbols for architecture x86_64) try to add to *~/.profile* file this or via Terminal
-
-       export PATH="/usr/local/opt/openssl/bin:$PATH"
-       export LDFLAGS="-L/usr/local/opt/openssl/lib"
-       export CPPFLAGS="-I/usr/local/opt/openssl/include"
-       export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
-
-For Qt Creator -> QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additional arguments:
-
-       LDFLAGS="-L/usr/local/opt/openssl/lib"
-       CPPFLAGS="-I/usr/local/opt/openssl/include"
-
-
-
 ## Copy Plugins
 
     $ cp \
@@ -204,13 +173,3 @@ For Qt Creator -> QtCreator Projects -> Build -> Build Settings -> Build Steps -
     ./plugins/VOIP/lib/libVOIP.dylib \
     ./plugins/RetroChess/lib/libRetroChess.dylib \
     ./retroshare-gui/src/RetroShare.app/Contents/Resources/
-
-### Compile Retroshare-Service & Webui with CMake
-before you can compile overwrite the file "asio/include/asio/detail/config.hpp" here is a fix for macos [
-asio fix](https://github.com/chriskohlhoff/asio/commit/68df16d560c68944809bb2947360fe8035e9ae0a)   
-
-       $ cd retroshare-service
-       $ mkdir build-dir
-       $ cd build-dir
-       $ cmake -DRS_WEBUI=ON -DCMAKE_BUILD_TYPE=Release ..
-       $ make
diff --git a/build_scripts/OSX/makeOSXPackage.sh b/build_scripts/OSX/makeOSXPackage.sh
deleted file mode 100644
index 8f9700ed0..000000000
--- a/build_scripts/OSX/makeOSXPackage.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-APP="RetroShare"
-RSVERSION="0.6.7a"
-QTVERSION="Qt-5.15.11"
-
-# Install the 7z to create dmg archives.
-#brew list p7zip || brew install p7zip
-
-# Package your app
-echo "Packaging retroshare..."
-#cd ${project_dir}/build/macOS/clang/x86_64/release/
-cd retroshare-gui/src/
-
-# Remove build directories that you don't want to deploy
-rm -rf moc
-rm -rf obj
-rm -rf qrc
-
-# This sets the CFBundleVersion & CFBundleShortVersionString string
-/usr/libexec/PlistBuddy -c "Delete :CFBundleGetInfoString" retroshare.app/Contents/Info.plist
-/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $RSVERSION" retroshare.app/Contents/Info.plist
-/usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string $RSVERSION" retroshare.app/Contents/Info.plist
-/usr/libexec/PlistBuddy -c "Delete :NSRequiresAquaSystemAppearance" retroshare.app/Contents/Info.plist
-
-# This automatically creates retroshare.dmg
-
-echo "Creating dmg archive..."
-macdeployqt retroshare.app -dmg
-
-DATE=`date +"%m-%d-%Y"`
-MACVERSION=`sw_vers -productVersion`
-#RSVERSION=`git describe --abbrev=0 --tags`
-GITHEAD=`git rev-parse --short HEAD`
-
-mv $APP.dmg "$APP-$RSVERSION-$GITHEAD-$DATE-MacOS-$MACVERSION-$QTVERSION.dmg"
-
-# You can use the appdmg command line app to create your dmg file if
-# you want to use a custom background and icon arrangement. I'm still
-# working on this for my apps, myself. If you want to do this, you'll
-# remove the -dmg option above.
-# appdmg json-path YourApp_${TRAVIS_TAG}.dmg
-
-# Copy other project files
-cp "../../libbitdht/src/bitdht/bdboot.txt" "retroshare.app/Contents/Resources/"
-cp "../../plugins/FeedReader/lib/libFeedReader.dylib" "retroshare.app/Contents/Resources/"
-cp -R "sounds" "retroshare.app/Contents/Resources/sounds"
-
-# cp "${project_dir}/README.md" "README.md"
-# cp "${project_dir}/LICENSE" "LICENSE"
-# cp "${project_dir}/Qt License" "Qt License"
diff --git a/build_scripts/RedHat+Fedora/data/retroshare.desktop b/build_scripts/RedHat+Fedora/data/retroshare.desktop
index 95056d54a..7b93b4fa5 100644
--- a/build_scripts/RedHat+Fedora/data/retroshare.desktop
+++ b/build_scripts/RedHat+Fedora/data/retroshare.desktop
@@ -1,11 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Name=RetroShare
-Comment=Securely communicate with your friends
+Comment=Securely share files with your friends
 Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
+Categories=Network;P2P;
 MimeType=x-scheme-handler/retroshare;
diff --git a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
index a0d1b67b6..2105112f1 100644
--- a/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
+++ b/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md
@@ -18,8 +18,8 @@ At the end, you'll get at ..\\*-msys2\deploy\ the Portable 7zip file.
 
 ### MSYS2 INSTALLATION (for editing or debugging)
 
-Download MSYS2 from [MSYS2](http://www.msys2.org/). Installing 
-MSYS2 requires 64 bit Windows 10 or newer.
+Download MSYS2 from [MSYS2](http://www.msys2.org/). Get the i686 version
+if you run a 32-bit Windows or the x86_64 if you run a 64-bit Windows.
 
 Run the installer and install MSYS2.
 
@@ -40,29 +40,26 @@ Run MSYS2 MSYS again and finish updating with:
 
 Install the default programs needed to build:
 
-	pacman -S base-devel git wget p7zip gcc perl ruby doxygen cmake
+	pacman -S base-devel git wget p7zip gcc perl ruby python2 doxygen cmake
 
-Install the 64-bit toolchain:
+Install the 32-bit toolchain:
 
-	pacman -S mingw-w64-x86_64-toolchain
+	pacman -S mingw-w64-i686-toolchain
 
 Install all needed dependencies:
 
-	pacman -S mingw-w64-x86_64-miniupnpc
-	pacman -S mingw-w64-x86_64-libxslt
-	pacman -S mingw-w64-x86_64-xapian-core
-	pacman -S mingw-w64-x86_64-sqlcipher
-	pacman -S mingw-w64-x86_64-qt5-base
-	pacman -S mingw-w64-x86_64-qt5-multimedia
-	pacman -S mingw-w64-x86_64-ccmake
-	pacman -S mingw-w64-x86_64-rapidjson
-	pacman -S mingw-w64-x86_64-json-c
-	pacman -S mingw-w64-x86_64-libbotan
-	pacman -S mingw-w64-x86_64-asio
+	pacman -S mingw-w64-i686-miniupnpc
+	pacman -S mingw-w64-i686-libmicrohttpd
+	pacman -S mingw-w64-i686-libxslt
+	pacman -S mingw-w64-i686-xapian-core
+	pacman -S mingw-w64-i686-sqlcipher
+	pacman -S mingw-w64-i686-qt5
+	pacman -S mingw32/mingw-w64-i686-cmake
+	pacman -S mingw-w64-i686-rapidjson
 
 If you want to use QtCreator as IDE, prefer using this one publish by MSYS2 as all build Kit are already setted.
 
-	pacman -S mingw-w64-x86_64-qt-creator
+	pacman -S mingw-w64-i686-qt-creator
 *You can start it from MSYS2 terminal.*
 
 
@@ -70,7 +67,7 @@ We're done installing MSYS2, close the shell terminal.
 
 ### BUILDING RETROSHARE
 
-Now run the MSYS2 MinGW 64-bit shell terminal (it's in the start menu).
+Now run the MSYS2 MinGW 32-bit shell terminal (it's in the start menu).
 We will use it to checkout Retroshare and build it:
 
 	git clone https://github.com/RetroShare/RetroShare.git
diff --git a/build_scripts/Windows-msys2/build/build-installer.bat b/build_scripts/Windows-msys2/build/build-installer.bat
index da404f273..192b2d025 100644
--- a/build_scripts/Windows-msys2/build/build-installer.bat
+++ b/build_scripts/Windows-msys2/build/build-installer.bat
@@ -43,7 +43,6 @@ set NSIS_PARAM=%NSIS_PARAM% /DDEPLOYDIR="%RsDeployPath%"
 set NSIS_PARAM=%NSIS_PARAM% /DOUTDIR="%RsPackPath%"
 set NSIS_PARAM=%NSIS_PARAM% /DINSTALLERADD="%RsArchiveAdd%"
 set NSIS_PARAM=%NSIS_PARAM% /DARCHITECTURE="%RsArchitecture%"
-set NSIS_PARAM=%NSIS_PARAM% /DTOOLCHAIN="%RsToolchain%"
 set NSIS_PARAM=%NSIS_PARAM% /DREVISION=%RsVersion.Extra%
 
 set QtMainVersion=%QtVersion:~0,1%
diff --git a/build_scripts/Windows-msys2/build/build.bat b/build_scripts/Windows-msys2/build/build.bat
index fc5632293..4fdaff09f 100644
--- a/build_scripts/Windows-msys2/build/build.bat
+++ b/build_scripts/Windows-msys2/build/build.bat
@@ -18,17 +18,15 @@ if errorlevel 1 goto error_env
 if not "%ParamNoupdate%"=="1" (
 	:: Install needed things
 	%EnvMSYS2Cmd% "pacman --noconfirm --needed -S make git mingw-w64-%RsMSYS2Architecture%-toolchain mingw-w64-%RsMSYS2Architecture%-qt5 mingw-w64-%RsMSYS2Architecture%-miniupnpc mingw-w64-%RsMSYS2Architecture%-sqlcipher mingw-w64-%RsMSYS2Architecture%-cmake mingw-w64-%RsMSYS2Architecture%-rapidjson"
-	:: rnp
-	%EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-json-c mingw-w64-%RsMSYS2Architecture%-libbotan"
 
 	:: Webui
-	if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen mingw-w64-%RsMSYS2Architecture%-asio"
+	if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen"
 
 	:: Plugins
 	if "%ParamPlugins%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-speex mingw-w64-%RsMSYS2Architecture%-speexdsp mingw-w64-%RsMSYS2Architecture%-curl mingw-w64-%RsMSYS2Architecture%-libxslt mingw-w64-%RsMSYS2Architecture%-opencv mingw-w64-%RsMSYS2Architecture%-ffmpeg"
 
 	:: Clang
-	if "%ClangCompiler%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-clang"
+	if "%ParamClang%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-clang"
 
 	:: Indexing
 	if "%ParamIndexing%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-xapian-core mingw-w64-%RsMSYS2Architecture%-libvorbis mingw-w64-%RsMSYS2Architecture%-flac mingw-w64-%RsMSYS2Architecture%-taglib"
@@ -79,10 +77,11 @@ echo %RsBuildConfig% >> buildinfo.txt
 echo %RsArchitecture% >> buildinfo.txt
 echo Qt %QtVersion% >> buildinfo.txt
 echo %RsToolchain% >> buildinfo.txt
+echo %RsCompiler% >> buildinfo.txt
 
 call "%ToolsPath%\msys2-path.bat" "%SourcePath%" MSYS2SourcePath
 call "%ToolsPath%\msys2-path.bat" "%EnvMSYS2Path%" MSYS2EnvMSYS2Path
-if "%ClangCompiler%"=="1" (
+if "%ParamClang%"=="1" (
 	%EnvMSYS2Cmd% "qmake "%MSYS2SourcePath%/RetroShare.pro" -r -spec win32-clang-g++ %RS_QMAKE_CONFIG%"
 ) else (
 	%EnvMSYS2Cmd% "qmake "%MSYS2SourcePath%/RetroShare.pro" -r -spec win32-g++ %RS_QMAKE_CONFIG%"
diff --git a/build_scripts/Windows-msys2/build/env-base.bat b/build_scripts/Windows-msys2/build/env-base.bat
index 6e5c8480f..01a7a8f12 100644
--- a/build_scripts/Windows-msys2/build/env-base.bat
+++ b/build_scripts/Windows-msys2/build/env-base.bat
@@ -5,7 +5,7 @@ set ParamAutologin=0
 set ParamPlugins=0
 set ParamTor=0
 set ParamWebui=0
-set ClangCompiler=0
+set ParamClang=0
 set ParamIndexing=0
 set ParamFriendserver=0
 set ParamNoupdate=0
@@ -55,6 +55,8 @@ if "%~1" NEQ "" (
 			set ParamWebui=1
 		) else if "%%~a"=="singlethread" (
 			set CoreCount=1
+		) else if "%%~a"=="clang" (
+			set ParamClang=1
 		) else if "%%~a"=="indexing" (
 			set ParamIndexing=1
 		) else if "%%~a"=="friendserver" (
@@ -94,18 +96,24 @@ if "%RsToolchain%"=="mingw32" (
 	set RsArchitecture=x64
 	set RsMSYS2Architecture=clang-x86_64
 	set MSYSTEM=CLANG64
-	set ClangCompiler=1
+	set ParamClang=1
 ) else if "%RsToolchain%"=="clang32" (
 	set RsArchitecture=x86
 	set RsMSYS2Architecture=clang-i686
 	set MSYSTEM=CLANG32
-	set ClangCompiler=1
+	set ParamClang=1
 ) else if "%RsToolchain%"=="clangarm64" (
 	set RsArchitecture=arm64
 	set RsMSYS2Architecture=clang-aarch64
 	set MSYSTEM=CLANGARM64
 )
 
+if "%ParamClang%"=="1" (
+	set RsCompiler=Clang
+) else (
+	set RsCompiler=GCC
+)
+
 if "%ParamRelease%"=="1" (
 	if "%ParamDebug%"=="1" (
 		echo.
@@ -154,6 +162,7 @@ echo autologin          Build with autologin
 echo plugins            Build plugins
 echo webui              Enable JsonAPI and pack webui files
 echo singlethread       Use only 1 thread for building
+echo clang              Use clang compiler instead of GCC
 echo indexing           Build with deep channel and file indexing support
 echo friendserver       Enable friendserver support
 echo noupdate           Skip updating the libraries
diff --git a/build_scripts/Windows-msys2/build/env.bat b/build_scripts/Windows-msys2/build/env.bat
index 38ceeaee3..ccba33db3 100644
--- a/build_scripts/Windows-msys2/build/env.bat
+++ b/build_scripts/Windows-msys2/build/env.bat
@@ -14,8 +14,8 @@ if "%QtVersion%"=="" %cecho% error "Cannot get Qt version." & exit /B 1
 
 set RsMinGWPath=%EnvMSYS2BasePath%\%RsToolchain%
 
-set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsToolchain%-%RsBuildConfig%
-set RsDeployPath=%DeployPath%\Qt-%QtVersion%-%RsToolchain%%RsType%-%RsBuildConfig%
+set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsToolchain%-%RsCompiler%-%RsBuildConfig%
+set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsToolchain%-%RsCompiler%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
 set RsWebuiBuildPath=%RsBuildPath%\retroshare-webui\webui
diff --git a/build_scripts/Windows-msys2/build/pack.bat b/build_scripts/Windows-msys2/build/pack.bat
index 3fa48c615..313da7479 100644
--- a/build_scripts/Windows-msys2/build/pack.bat
+++ b/build_scripts/Windows-msys2/build/pack.bat
@@ -71,9 +71,9 @@ if "%QtMainVersion%"=="4" set QtMainVersion2=4
 if "%QtMainVersion%"=="5" set QtMainVersion1=5
 
 if "%RsBuildConfig%" NEQ "release" (
-	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsToolchain%-msys2%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z
+	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsArchitecture%-msys2%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z
 ) else (
-	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsToolchain%-msys2%RsType%%RsArchiveAdd%.7z
+	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsArchitecture%-msys2%RsType%%RsArchiveAdd%.7z
 )
 
 if exist "%Archive%" del /Q "%Archive%"
@@ -105,7 +105,6 @@ copy "%RsBuildPath%\retroshare-nogui\src\%RsBuildConfig%\retroshare*-nogui.exe"
 copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
 copy "%RsBuildPath%\supportlibs\cmark\build\src\libcmark.dll" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
-if exist "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" copy "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" (
 	copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
 )
diff --git a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
index cea1df073..eaeba1482 100644
--- a/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows-msys2/env/tools/prepare-msys2.bat
@@ -16,7 +16,7 @@ if "%~1"=="clean" (
 	goto exit
 )
 
-set MSYS2Version=20241208
+set MSYS2Version=20231026
 
 set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
 set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
diff --git a/build_scripts/Windows-msys2/installer/retroshare-Qt5.nsi b/build_scripts/Windows-msys2/installer/retroshare-Qt5.nsi
index f37f33cf8..cd4a7867e 100644
--- a/build_scripts/Windows-msys2/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows-msys2/installer/retroshare-Qt5.nsi
@@ -9,7 +9,6 @@
 ;!define REVISION ""
 ;!define DEPLOYDIR ""
 ;!define ARCHITECTURE ""
-;!define TOOLCHAIN ""
 
 # Optional defines
 ;!define OUTDIR ""
@@ -22,9 +21,6 @@
 !ifndef ARCHITECTURE
 !error "ARCHITECTURE is not defined"
 !endif
-!ifndef TOOLCHAIN
-!error "TOOLCHAIN is not defined"
-!endif
 
 # Check optional defines
 !ifdef OUTDIR
@@ -76,7 +72,7 @@ ${!defineifexist} TOR_EXISTS "${DEPLOYDIR}\tor.exe"
 # Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-${TOOLCHAIN}-msys2${RSTYPE}${INSTALLERADD}-setup.exe"
+OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-${ARCHITECTURE}${RSTYPE}${INSTALLERADD}-setup.exe"
 BrandingText "${APPNAMEANDVERSION}"
 RequestExecutionlevel highest
 # Use compression
diff --git a/build_scripts/Windows-msys2/readme.md b/build_scripts/Windows-msys2/readme.md
index f5e214ee7..5582ec451 100644
--- a/build_scripts/Windows-msys2/readme.md
+++ b/build_scripts/Windows-msys2/readme.md
@@ -55,6 +55,7 @@ Run the scripts in this order:
   * "CONFIG+=..."       enable other extra compile time features, you can find the almost complete list in file *<sourcefolder>\retroshare.pri*
 * For fixing compile problems (optional)
   * singlethread:       use only 1 thread for building, slow but useful if you don't find the error message in the console
+  * clang:              use clang compiler instead of GCC
   * noupdate:           skip the msys2 update step, sometimes some msys2 packages are broken, you can manually switch back to the older package, and this option will prevent updating to the broken version again
 
 Example:
diff --git a/build_scripts/Windows/build-libs/Makefile b/build_scripts/Windows/build-libs/Makefile
index b0c9ce137..0075770cd 100644
--- a/build_scripts/Windows/build-libs/Makefile
+++ b/build_scripts/Windows/build-libs/Makefile
@@ -2,32 +2,23 @@ ZLIB_VERSION=1.2.11
 BZIP2_VERSION=1.0.8
 MINIUPNPC_VERSION=2.2.3
 OPENSSL_VERSION=1.1.1w
-SPEEX_VERSION=1.2.1
-SPEEXDSP_VERSION=1.2.1
-LIBXML2_MAIN_VERSION=2.14
-LIBXML2_VERSION=$(LIBXML2_MAIN_VERSION).5
-LIBXSLT_MAIN_VERSION=1.1
-LIBXSLT_VERSION=$(LIBXSLT_MAIN_VERSION).43
-CURL_VERSION=8.9.1
+SPEEX_VERSION=1.2.0
+SPEEXDSP_VERSION=1.2.0
+LIBXML2_VERSION=2.9.12
+LIBXSLT_VERSION=1.1.34
+CURL_VERSION=7.81.0
 TCL_VERSION=8.6.10
 SQLCIPHER_VERSION=4.5.0
 LIBMICROHTTPD_VERSION=0.9.75
-FFMPEG_VERSION=4.4.6
+FFMPEG_VERSION=4.4
 RAPIDJSON_VERSION=1.1.0
-XAPIAN_VERSION=1.4.29
-ASIO_VERSION=1-34-2
-#RNP_VERSION=0.17.1
-
-# libaries for rnp
-JSON_C_VERSION=0.18
-BOTAN_VERSION=2.19.5
+XAPIAN_VERSION=1.4.19
 
 DOWNLOAD_PATH?=download
 BUILD_PATH=build
 LIBS_PATH?=libs
 
-all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian jsonc botan asio copylibs
-#rnp
+all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian copylibs
 
 download: \
 	$(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz \
@@ -36,13 +27,13 @@ download: \
 	$(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz \
-	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz \
+	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz \
+	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz \
 	$(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz \
+	$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/rapidjson-$(RAPIDJSON_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/xapian-core-$(XAPIAN_VERSION).tar.xz
 
@@ -193,52 +184,50 @@ $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION): $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP
 	rm -r -f speexdsp-$(SPEEXDSP_VERSION)
 	mv $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tmp $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION)
 
-libxml: \
-	$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION) \
-	$(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)
+libxml2: $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)
 
-$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz:
-	wget --no-check-certificate https://download.gnome.org/sources/libxml2/$(LIBXML2_MAIN_VERSION)/libxml2-$(LIBXML2_VERSION).tar.xz -O $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
+$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz:
+	wget ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
 
-$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz:
-	wget --no-check-certificate https://download.gnome.org/sources/libxslt/$(LIBXSLT_MAIN_VERSION)/libxslt-$(LIBXSLT_VERSION).tar.xz -O $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
-
-$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION) $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION): \
-	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz \
-	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
-	# libxml2: prepare
-	pacman --needed --noconfirm -S python3 pkg-config
+$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
+	# prepare
 	rm -r -f $(BUILD_PATH)/libxml2-*
-	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
-	# libxslt: prepare
-	rm -r -f $(BUILD_PATH)/libxslt-*
-	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
-	tar xvf $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
-	# libxml2: build
+	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
+	# build
 	cd libxml2-$(LIBXML2_VERSION) && ./configure --without-iconv -enable-shared=no
 	#cd libxml2-$(LIBXML2_VERSION) && make install exec_prefix="`pwd`/../$(BUILD_PATH)"
-	cd libxml2-$(LIBXML2_VERSION) && make libxml2.la
-	# libxslt: build
-	cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC
-	cd libxslt-$(LIBXSLT_VERSION)/libxslt && make
-	cd libxslt-$(LIBXSLT_VERSION)/libexslt && make
-	# libxml2: copy files
+	cd libxml2-$(LIBXML2_VERSION) && make
+	# copy files
 	mkdir -p $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/include/libxml
 	cp libxml2-$(LIBXML2_VERSION)/include/libxml/*.h $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/include/libxml/
 	mkdir -p $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/lib
 	cp libxml2-$(LIBXML2_VERSION)/.libs/libxml2.a $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/lib/
-	# libxslt: copy files
+	# cleanup
+	#rm -r -f libxml2-$(LIBXML2_VERSION) # see libxslt
+	mv $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)
+
+libxslt: $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)
+
+$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz:
+	wget ftp://xmlsoft.org/libxml2/libxslt-$(LIBXSLT_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
+
+$(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
+	# prepare
+	rm -r -f $(BUILD_PATH)/libxslt-*
+	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
+	tar xvf $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
+	# build
+	cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC
+	cd libxslt-$(LIBXSLT_VERSION) && make
+	# copy files
 	mkdir -p $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/include/libxslt
 	cp libxslt-$(LIBXSLT_VERSION)/libxslt/*.h $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/include/libxslt/
 	mkdir -p $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib
 	cp libxslt-$(LIBXSLT_VERSION)/libxslt/.libs/libxslt.a $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib/
 	cp libxslt-$(LIBXSLT_VERSION)/libexslt/.libs/libexslt.a $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib/
-	# libxml2: cleanup
+	# cleanup
 	rm -r -f libxml2-$(LIBXML2_VERSION)
-	# libxslt: cleanup
 	rm -r -f libxslt-$(LIBXSLT_VERSION)
-	# finish
-	mv $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)
 	mv $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)
 
 curl: $(BUILD_PATH)/curl-$(CURL_VERSION)
@@ -253,7 +242,7 @@ $(BUILD_PATH)/curl-$(CURL_VERSION): $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz
 	# build
 	cd curl-$(CURL_VERSION) && ./configure --disable-shared --with-ssl="`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)"
 	#cd curl-$(CURL_VERSION) && make install exec_prefix="`pwd`/../$(BUILD_PATH)"
-	cd curl-$(CURL_VERSION)/lib && make
+	cd curl-$(CURL_VERSION) && make
 	# copy files
 	mkdir -p $(BUILD_PATH)/curl-$(CURL_VERSION).tmp/include/curl
 	cp curl-$(CURL_VERSION)/include/curl/*.h $(BUILD_PATH)/curl-$(CURL_VERSION).tmp/include/curl/
@@ -316,13 +305,13 @@ $(BUILD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION): $(DOWNLOAD_PATH)/libmicroh
 
 ffmpeg: $(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION)
 
-$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz:
-	wget --no-check-certificate https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.xz -O $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
+$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz:
+	wget --no-check-certificate https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.gz -O $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
 
-$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION): $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
+$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION): $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
 	# prepare
 	rm -r -f $(BUILD_PATH)/ffmpeg-*
-	tar xvf $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
+	tar xvf $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
 	# build
 	cd ffmpeg-$(FFMPEG_VERSION) && ./configure --disable-shared --enable-static --disable-programs --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-yasm --disable-everything --enable-encoder=mpeg4 --enable-decoder=mpeg4 --prefix="`pwd`/../$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION).tmp"
 	cd ffmpeg-$(FFMPEG_VERSION) && make install
@@ -374,73 +363,8 @@ $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION): $(DOWNLOAD_PATH)/xapian-core-$(XAPI
 	rm -r -f xapian-core-$(XAPIAN_VERSION)
 	mv $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION).tmp $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION)
 
-jsonc: $(BUILD_PATH)/json-c-$(JSON_C_VERSION)
-
-$(BUILD_PATH)/json-c-$(JSON_C_VERSION):
-	# prepare
-	rm -r -f $(BUILD_PATH)/json-c-*
-	[ -d "json-c-$(JSON_C_VERSION)" ] || git clone https://github.com/json-c/json-c.git --depth=1 --branch json-c-$(JSON_C_VERSION) "json-c-$(JSON_C_VERSION)"
-	# build
-	mkdir -p json-c-$(JSON_C_VERSION)/build
-	cd json-c-$(JSON_C_VERSION)/build && cmake .. -G"MSYS Makefiles" -Wno-dev -DCMAKE_BUILD_TYPE="release" -DBUILD_SHARED_LIBS=off -DBUILD_STATIC_LIBS=on -DBUILD_TESTING=off -DCMAKE_CXX_FLAGS="-D__MINGW_USE_VC2005_COMPAT" -DCMAKE_INSTALL_PREFIX="`pwd`/install" -DCMAKE_INSTALL_PREFIX="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION).tmp"
-	cd json-c-$(JSON_C_VERSION)/build && make install
-	# cleanup
-	rm -r -f json-c-$(JSON_C_VERSION)
-	mv $(BUILD_PATH)/json-c-$(JSON_C_VERSION).tmp $(BUILD_PATH)/json-c-$(JSON_C_VERSION)
-
-botan: $(BUILD_PATH)/botan-$(BOTAN_VERSION)
-
-$(BUILD_PATH)/botan-$(BOTAN_VERSION):
-	# prepare
-	pacman --needed --noconfirm -S python3
-	rm -r -f $(BUILD_PATH)/botan-*
-	[ -d "botan-$(BOTAN_VERSION)" ] || git clone https://github.com/randombit/botan.git --depth=1 --branch $(BOTAN_VERSION) "botan-$(BOTAN_VERSION)"
-	# build
-	if [ $(MSYSTEM) = "MINGW32" ] ; then cd botan-$(BOTAN_VERSION) && ./configure.py --os=mingw --cpu=x86_32 --disable-shared-library --enable-static-library --extra-cxxflags="-D__MINGW_USE_VC2005_COMPAT" --prefix="`pwd`/../$(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp" ; fi
-	if [ $(MSYSTEM) = "MINGW64" ] ; then cd botan-$(BOTAN_VERSION) && ./configure.py --os=mingw --cpu=x86_64 --disable-shared-library --enable-static-library --prefix="`pwd`/../$(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp" ; fi
-	cd botan-$(BOTAN_VERSION) && make install
-	# cleanup
-	rm -r -f botan-$(BOTAN_VERSION)
-	mv $(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp $(BUILD_PATH)/botan-$(BOTAN_VERSION)
-
-asio: $(BUILD_PATH)/asio-$(ASIO_VERSION)
-
-$(BUILD_PATH)/asio-$(ASIO_VERSION):
-	# prepare
-	rm -r -f $(BUILD_PATH)/asio-*
-	[ -d "asio-$(ASIO_VERSION)" ] || git clone https://github.com/chriskohlhoff/asio.git --depth=1 --branch asio-$(ASIO_VERSION) "asio-$(ASIO_VERSION)"
-	# copy files
-	mkdir -p $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/asio
-	cp asio-$(ASIO_VERSION)/asio/include/*.hpp $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/
-	cp -r asio-$(ASIO_VERSION)/asio/include/asio/* $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/asio/
-	# cleanup
-	rm -r -f asio-$(ASIO_VERSION)
-	mv $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp $(BUILD_PATH)/asio-$(ASIO_VERSION)
-
-rnp: $(BUILD_PATH)/rnp-$(RNP_VERSION)
-
-$(BUILD_PATH)/rnp-$(RNP_VERSION):
-	# prepare
-	rm -r -f $(BUILD_PATH)/rnp-*
-	[ -d "rnp-$(RNP_VERSION)" ] || git clone https://github.com/rnpgp/rnp.git --depth=1 --branch v$(RNP_VERSION) --recurse-submodules --shallow-submodules "rnp-$(RNP_VERSION)"
-	# build
-	mkdir -p rnp-$(RNP_VERSION)/build
-	cd rnp-$(RNP_VERSION)/build && cmake .. -G"MSYS Makefiles" -Wno-dev -DCMAKE_INSTALL_PREFIX="`pwd`/install" -DBUILD_SHARED_LIBS=yes -DBUILD_TESTING=off -DCMAKE_CXX_FLAGS="-D__MINGW_USE_VC2005_COMPAT -D__STDC_FORMAT_MACROS" -DBZIP2_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/include" -DBZIP2_LIBRARY_RELEASE="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/lib/libbz2.a" -DBZIP2_LIBRARIES="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/lib/libbz2.a" -DZLIB_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/zlib-$(ZLIB_VERSION)/include" -DZLIB_LIBRARY="`pwd`/../../$(BUILD_PATH)/zlib-$(ZLIB_VERSION)/lib/libz.a" -DJSON-C_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION)/include/json-c" -DJSON-C_LIBRARY="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION)/lib/libjson-c.a" -DBOTAN_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/botan-$(BOTAN_VERSION)/include/botan-`echo $(BOTAN_VERSION) | cut -c1-1`" -DBOTAN_LIBRARY="`pwd`/../../$(BUILD_PATH)/botan-$(BOTAN_VERSION)/lib/libbotan-`echo $(BOTAN_VERSION) | cut -c1-1`.a"
-	cmake --build rnp-$(RNP_VERSION)/build
-	# copy files
-	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp
-	cp -r rnp-$(RNP_VERSION)/include/rnp/* $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp/
-	cp -r rnp-$(RNP_VERSION)/build/src/lib/rnp/* $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp/
-	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/lib
-	cp -r rnp-$(RNP_VERSION)/build/src/lib/librnp.dll.a $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/lib/
-	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/bin
-	cp -r rnp-$(RNP_VERSION)/build/src/lib/librnp.dll $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/bin/
-	# cleanup
-	rm -r -f rnp-$(RNP_VERSION)
-	mv $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp $(BUILD_PATH)/rnp-$(RNP_VERSION)
-
 copylibs:
 	rm -r -f $(LIBS_PATH) ; \
 	mkdir -p $(LIBS_PATH) ; \
-	cp -p $(BUILD_PATH)/gcc-version $(LIBS_PATH) ; \
-	find $(BUILD_PATH) -mindepth 1 -maxdepth 1 -type d -not -name "*.tmp" -print -exec cp -r -p {}/. $(LIBS_PATH) \; ; \
+	cp $(BUILD_PATH)/gcc-version $(LIBS_PATH) ; \
+	find $(BUILD_PATH) -mindepth 1 -maxdepth 1 -type d -not -name "*.tmp" -print -exec cp -r {}/. $(LIBS_PATH) \; ; \
diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat
index ff347babf..1c844efa0 100644
--- a/build_scripts/Windows/build/pack.bat
+++ b/build_scripts/Windows/build/pack.bat
@@ -96,7 +96,6 @@ copy nul "%RsDeployPath%\portable" %Quite%
 echo copy binaries
 copy "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\retroshare*.exe" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
-if exist "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" copy "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" "%RsDeployPath%" %Quite%
 
 if "%ParamService%"=="1" (
 	copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
diff --git a/build_scripts/Windows/env/tools/prepare-msys2.bat b/build_scripts/Windows/env/tools/prepare-msys2.bat
index ba2f12ce6..25f00ac30 100644
--- a/build_scripts/Windows/env/tools/prepare-msys2.bat
+++ b/build_scripts/Windows/env/tools/prepare-msys2.bat
@@ -16,13 +16,13 @@ if "%~1"=="clean" (
 	goto exit
 )
 
-set MSYS2Version=20241208
+set MSYS2Version=20231026
 
 set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
 set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
 set MSYS2UnpackPath=%EnvMSYS2Path%\msys64
-set CMakeInstall=cmake-3.31.3-windows-i386.zip
-set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.31.3/%CMakeInstall%
+set CMakeInstall=cmake-3.19.0-win32-x86.zip
+set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
 
 if exist "%MSYS2UnpackPath%\usr\bin\pacman.exe" (
 	if "%~1"=="reinstall" (
diff --git a/build_scripts/Windows/env/tools/prepare-tools.bat b/build_scripts/Windows/env/tools/prepare-tools.bat
index f088acfa8..88549faed 100644
--- a/build_scripts/Windows/env/tools/prepare-tools.bat
+++ b/build_scripts/Windows/env/tools/prepare-tools.bat
@@ -19,9 +19,9 @@ set MinGitInstallPath=%EnvToolsPath%\MinGit
 set DoxygenInstall=doxygen-1.9.6.windows.x64.bin.zip
 set DoxygenUrl=https://github.com/doxygen/doxygen/releases/download/Release_1_9_6/%DoxygenInstall%
 set DoxygenInstallPath=%EnvToolsPath%\doxygen
-set CMakeVersion=cmake-3.31.3-windows-i386
+set CMakeVersion=cmake-3.19.0-win32-x86
 set CMakeInstall=%CMakeVersion%.zip
-set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.31.3/%CMakeInstall%
+set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
 set CMakeInstallPath=%EnvToolsPath%\cmake
 set TorProjectUrl=https://www.torproject.org
 set TorDownloadIndexUrl=%TorProjectUrl%/download/tor
diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi
index c7a5b9554..63c81bbcc 100644
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@@ -247,7 +247,6 @@ Section $(Section_Main) Section_Main
 
   ; External binaries
   File "${EXTERNAL_LIB_DIR}\bin\miniupnpc.dll"
-  File "${RELEASEDIR}\supportlibs\librnp\Build\src\lib\librnp.dll"
   !if ${ARCHITECTURE} == "x86"
     File "${EXTERNAL_LIB_DIR}\bin\libcrypto-1_1.dll"
     File "${EXTERNAL_LIB_DIR}\bin\libssl-1_1.dll"
diff --git a/build_scripts/git_tag_cleaner.sh b/build_scripts/git_tag_cleaner.sh
deleted file mode 100755
index cf7a3ef0c..000000000
--- a/build_scripts/git_tag_cleaner.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-function git_del_tag()
-{
-	mTag=$1
-
-	for mRemote in $(git remote); do
-		echo "Attempting tag $mTag removal from remote $mRemote"
-		GIT_TERMINAL_PROMPT=0 git push $mRemote :$mTag || true
-	done
-	git tag --delete $mTag
-}
-
-for mModule in . build_scripts/OBS/ libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ ; do
-	pushd $mModule
-	git_del_tag v0.6.7a
-	git tag --list | grep untagged | while read mTag; do git_del_tag $mTag ; done
-	popd
-done
-
diff --git a/data/retroshare.desktop b/data/retroshare.desktop
index 95056d54a..efc73dd6b 100644
--- a/data/retroshare.desktop
+++ b/data/retroshare.desktop
@@ -7,5 +7,5 @@ Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
+Categories=Application;Network;P2P;Feed;Chat;InstantMessaging
 MimeType=x-scheme-handler/retroshare;
diff --git a/libretroshare b/libretroshare
index ac83e00ea..bfa91bdef 160000
--- a/libretroshare
+++ b/libretroshare
@@ -1 +1 @@
-Subproject commit ac83e00ea7a26cd6cf57cefef745d6dcfd07e5da
+Subproject commit bfa91bdef24f2339f1db053d155a6ef169027a95
diff --git a/openpgpsdk b/openpgpsdk
index 178aa8ebc..b41667912 160000
--- a/openpgpsdk
+++ b/openpgpsdk
@@ -1 +1 @@
-Subproject commit 178aa8ebcef47e3271d5a5ca5c07e45d3b71c81d
+Subproject commit b41667912751a453e8e5d4733215a0609277a26f
diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro
index 97137c2b2..5c696b5c3 100644
--- a/plugins/FeedReader/FeedReader.pro
+++ b/plugins/FeedReader/FeedReader.pro
@@ -45,7 +45,6 @@ SOURCES =	FeedReaderPlugin.cpp \
 			gui/FeedReaderUserNotify.cpp \
 			gui/FeedReaderFeedItem.cpp \
 			gui/FeedTreeWidget.cpp \
-			gui/ProxyWidget.cpp \
 			util/CURLWrapper.cpp \
 			util/XMLWrapper.cpp \
 			util/HTMLWrapper.cpp \
@@ -67,7 +66,6 @@ HEADERS =	FeedReaderPlugin.h \
 			gui/FeedReaderUserNotify.h \
 			gui/FeedReaderFeedItem.h \
 			gui/FeedTreeWidget.h \
-			gui/ProxyWidget.h \
 			util/CURLWrapper.h \
 			util/XMLWrapper.h \
 			util/HTMLWrapper.h \
@@ -78,8 +76,7 @@ FORMS =		gui/FeedReaderDialog.ui \
 			gui/AddFeedDialog.ui \
 			gui/PreviewFeedDialog.ui \
 			gui/FeedReaderConfig.ui \
-			gui/FeedReaderFeedItem.ui \
-			gui/ProxyWidget.ui
+			gui/FeedReaderFeedItem.ui
 
 TARGET = FeedReader
 
@@ -128,7 +125,7 @@ win32 {
 
 	isEmpty(QMAKE_SH) {
 		# MinGW
-		LIBS += -lcrypt32 -lbcrypt
+		LIBS += -lcrypt32
 	}
 
 	# Check for msys2
diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp
index b6e781c4b..59baf908a 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.cpp
+++ b/plugins/FeedReader/gui/AddFeedDialog.cpp
@@ -180,7 +180,8 @@ void AddFeedDialog::useStandardUpdateIntervalToggled()
 void AddFeedDialog::useStandardProxyToggled()
 {
 	bool checked = ui->useStandardProxyCheckBox->isChecked();
-	ui->proxyWidget->setEnabled(!checked);
+	ui->proxyAddressLineEdit->setEnabled(!checked);
+	ui->proxyPortSpinBox->setEnabled(!checked);
 }
 
 void AddFeedDialog::typeForumToggled()
@@ -334,8 +335,8 @@ bool AddFeedDialog::fillFeed(uint32_t feedId)
 		ui->passwordLineEdit->setText(QString::fromUtf8(feedInfo.password.c_str()));
 
 		ui->useStandardProxyCheckBox->setChecked(feedInfo.flag.standardProxy);
-		ui->proxyWidget->setAddress(QString::fromUtf8(feedInfo.proxyAddress.c_str()));
-		ui->proxyWidget->setPort(feedInfo.proxyPort);
+		ui->proxyAddressLineEdit->setText(QString::fromUtf8(feedInfo.proxyAddress.c_str()));
+		ui->proxyPortSpinBox->setValue(feedInfo.proxyPort);
 
 		ui->useStandardUpdateInterval->setChecked(feedInfo.flag.standardUpdateInterval);
 		ui->updateIntervalSpinBox->setValue(feedInfo.updateInterval / 60);
@@ -424,8 +425,8 @@ void AddFeedDialog::getFeedInfo(FeedInfo &feedInfo)
 	feedInfo.password = ui->passwordLineEdit->text().toUtf8().constData();
 
 	feedInfo.flag.standardProxy = ui->useStandardProxyCheckBox->isChecked();
-	feedInfo.proxyAddress = ui->proxyWidget->address().toUtf8().constData();
-	feedInfo.proxyPort = ui->proxyWidget->port();
+	feedInfo.proxyAddress = ui->proxyAddressLineEdit->text().toUtf8().constData();
+	feedInfo.proxyPort = ui->proxyPortSpinBox->value();
 
 	feedInfo.flag.standardUpdateInterval = ui->useStandardUpdateInterval->isChecked();
 	feedInfo.updateInterval = ui->updateIntervalSpinBox->value() * 60;
diff --git a/plugins/FeedReader/gui/AddFeedDialog.ui b/plugins/FeedReader/gui/AddFeedDialog.ui
index 569578473..ebb478162 100644
--- a/plugins/FeedReader/gui/AddFeedDialog.ui
+++ b/plugins/FeedReader/gui/AddFeedDialog.ui
@@ -133,16 +133,37 @@
         <property name="title">
          <string>Proxy</string>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <item>
+        <layout class="QGridLayout" name="gridLayout_6">
+         <item row="0" column="0" colspan="2">
           <widget class="QCheckBox" name="useStandardProxyCheckBox">
            <property name="text">
             <string>Use standard proxy</string>
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="ProxyWidget" name="proxyWidget" native="true"/>
+         <item row="1" column="0">
+          <widget class="QLabel" name="serverLabel">
+           <property name="text">
+            <string>Server</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="proxyAddressLineEdit"/>
+         </item>
+         <item row="1" column="2">
+          <widget class="QLabel" name="portLabel">
+           <property name="text">
+            <string>:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <widget class="QSpinBox" name="proxyPortSpinBox">
+           <property name="maximum">
+            <number>65535</number>
+           </property>
+          </widget>
          </item>
         </layout>
        </widget>
@@ -444,12 +465,6 @@
    <extends>QComboBox</extends>
    <header>gui/common/RSComboBox.h</header>
   </customwidget>
-  <customwidget>
-   <class>ProxyWidget</class>
-   <extends>QWidget</extends>
-   <header>gui/ProxyWidget.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>urlLineEdit</tabstop>
@@ -479,7 +494,8 @@
   <tabstop>useStandardUpdateInterval</tabstop>
   <tabstop>updateIntervalSpinBox</tabstop>
   <tabstop>useStandardProxyCheckBox</tabstop>
-  <tabstop>proxyWidget</tabstop>
+  <tabstop>proxyAddressLineEdit</tabstop>
+  <tabstop>proxyPortSpinBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/plugins/FeedReader/gui/FeedReaderConfig.cpp b/plugins/FeedReader/gui/FeedReaderConfig.cpp
index 91b24f394..89456e3da 100644
--- a/plugins/FeedReader/gui/FeedReaderConfig.cpp
+++ b/plugins/FeedReader/gui/FeedReaderConfig.cpp
@@ -31,7 +31,8 @@ FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WindowFlags flags)
 	/* Invoke the Qt Designer generated object setup routine */
 	ui->setupUi(this);
 
-	ui->proxyWidget->setEnabled(false);
+	ui->proxyAddressLineEdit->setEnabled(false);
+	ui->proxyPortSpinBox->setEnabled(false);
 
 	/* Connect signals */
 	connect(ui->updateIntervalSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, [this]() {
@@ -50,7 +51,8 @@ FeedReaderConfig::FeedReaderConfig(QWidget *parent, Qt::WindowFlags flags)
 		Settings->setValueToGroup("FeedReaderDialog", "OpenAllInNewTab", ui->openAllInNewTabCheckBox->isChecked());
 	});
 	connect(ui->useProxyCheckBox, &QCheckBox::toggled, this, &FeedReaderConfig::updateProxy);
-	connect(ui->proxyWidget, &ProxyWidget::changed, this, &FeedReaderConfig::updateProxy);
+	connect(ui->proxyAddressLineEdit, &QLineEdit::textChanged, this, &FeedReaderConfig::updateProxy);
+	connect(ui->proxyPortSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, &FeedReaderConfig::updateProxy);
 
 	connect(ui->useProxyCheckBox, SIGNAL(toggled(bool)), this, SLOT(useProxyToggled()));
 }
@@ -73,8 +75,8 @@ void FeedReaderConfig::load()
 	std::string proxyAddress;
 	uint16_t proxyPort;
 	whileBlocking(ui->useProxyCheckBox)->setChecked(rsFeedReader->getStandardProxy(proxyAddress, proxyPort));
-	whileBlocking(ui->proxyWidget)->setAddress(QString::fromUtf8(proxyAddress.c_str()));
-	whileBlocking(ui->proxyWidget)->setPort(proxyPort);
+	whileBlocking(ui->proxyAddressLineEdit)->setText(QString::fromUtf8(proxyAddress.c_str()));
+	whileBlocking(ui->proxyPortSpinBox)->setValue(proxyPort);
 
 	loaded = true;
 
@@ -85,10 +87,11 @@ void FeedReaderConfig::useProxyToggled()
 {
 	bool enabled = ui->useProxyCheckBox->isChecked();
 
-	ui->proxyWidget->setEnabled(enabled);
+	ui->proxyAddressLineEdit->setEnabled(enabled);
+	ui->proxyPortSpinBox->setEnabled(enabled);
 }
 
 void FeedReaderConfig::updateProxy()
 {
-	rsFeedReader->setStandardProxy(ui->useProxyCheckBox->isChecked(), ui->proxyWidget->address().toUtf8().constData(), ui->proxyWidget->port());
+	rsFeedReader->setStandardProxy(ui->useProxyCheckBox->isChecked(), ui->proxyAddressLineEdit->text().toUtf8().constData(), ui->proxyPortSpinBox->value());
 }
diff --git a/plugins/FeedReader/gui/FeedReaderConfig.ui b/plugins/FeedReader/gui/FeedReaderConfig.ui
index 18fa29a42..8928dc85e 100644
--- a/plugins/FeedReader/gui/FeedReaderConfig.ui
+++ b/plugins/FeedReader/gui/FeedReaderConfig.ui
@@ -77,16 +77,37 @@
      <property name="title">
       <string>Proxy</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0" colspan="4">
        <widget class="QCheckBox" name="useProxyCheckBox">
         <property name="text">
          <string>Use proxy</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="ProxyWidget" name="proxyWidget" native="true"/>
+      <item row="1" column="0">
+       <widget class="QLabel" name="serverLabel">
+        <property name="text">
+         <string>Server</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="proxyAddressLineEdit"/>
+      </item>
+      <item row="1" column="3">
+       <widget class="QSpinBox" name="proxyPortSpinBox">
+        <property name="maximum">
+         <number>65535</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="potLabel">
+        <property name="text">
+         <string>:</string>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -136,19 +157,12 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>ProxyWidget</class>
-   <extends>QWidget</extends>
-   <header>gui/ProxyWidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>updateIntervalSpinBox</tabstop>
   <tabstop>storageTimeSpinBox</tabstop>
   <tabstop>useProxyCheckBox</tabstop>
-  <tabstop>proxyWidget</tabstop>
+  <tabstop>proxyAddressLineEdit</tabstop>
+  <tabstop>proxyPortSpinBox</tabstop>
   <tabstop>saveInBackgroundCheckBox</tabstop>
   <tabstop>setMsgToReadOnActivate</tabstop>
   <tabstop>openAllInNewTabCheckBox</tabstop>
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.cpp b/plugins/FeedReader/gui/FeedReaderDialog.cpp
index 87db9cf9c..08f390a09 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.cpp
+++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp
@@ -129,8 +129,6 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, FeedReaderNotify *n
 	settingsChanged();
 
 	feedTreeItemActivated(NULL);
-
-	mFontSizeHandler.registerFontSize(ui->feedTreeWidget);
 }
 
 FeedReaderDialog::~FeedReaderDialog()
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.h b/plugins/FeedReader/gui/FeedReaderDialog.h
index a9672bc76..12e11ee7f 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.h
+++ b/plugins/FeedReader/gui/FeedReaderDialog.h
@@ -23,7 +23,6 @@
 
 #include <retroshare-gui/mainpage.h>
 #include "interface/rsFeedReader.h"
-#include "util/FontSizeHandler.h"
 
 namespace Ui {
 class FeedReaderDialog;
@@ -99,8 +98,6 @@ private:
 	RsFeedReader *mFeedReader;
 	FeedReaderNotify *mNotify;
 
-	FontSizeHandler mFontSizeHandler;
-
 	/** Qt Designer generated object */
 	Ui::FeedReaderDialog *ui;
 };
diff --git a/plugins/FeedReader/gui/FeedReaderDialog.ui b/plugins/FeedReader/gui/FeedReaderDialog.ui
index 440bb7736..b6b004d69 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.ui
+++ b/plugins/FeedReader/gui/FeedReaderDialog.ui
@@ -57,10 +57,10 @@
        <item row="0" column="0">
         <widget class="QFrame" name="toolBarFrame">
          <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
           <property name="leftMargin">
diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
index ec0e3d0e2..59f72103c 100644
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp
@@ -154,8 +154,6 @@ FeedReaderMessageWidget::FeedReaderMessageWidget(uint32_t feedId, RsFeedReader *
 	ui->msgTreeWidget->installEventFilter(this);
 
 	setFeedId(feedId);
-
-	mFontSizeHandler.registerFontSize(ui->msgTreeWidget);
 }
 
 FeedReaderMessageWidget::~FeedReaderMessageWidget()
diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.h b/plugins/FeedReader/gui/FeedReaderMessageWidget.h
index 40f16e29f..1223b3b4e 100644
--- a/plugins/FeedReader/gui/FeedReaderMessageWidget.h
+++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.h
@@ -24,7 +24,6 @@
 #include <QWidget>
 
 #include "interface/rsFeedReader.h"
-#include "util/FontSizeHandler.h"
 
 namespace Ui {
 class FeedReaderMessageWidget;
@@ -108,8 +107,6 @@ private:
 	RsFeedReader *mFeedReader;
 	FeedReaderNotify *mNotify;
 
-	FontSizeHandler mFontSizeHandler;
-
 	Ui::FeedReaderMessageWidget *ui;
 };
 
diff --git a/plugins/FeedReader/gui/ProxyWidget.cpp b/plugins/FeedReader/gui/ProxyWidget.cpp
deleted file mode 100644
index eeb0c5256..000000000
--- a/plugins/FeedReader/gui/ProxyWidget.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "ProxyWidget.h"
-#include "ui_ProxyWidget.h"
-
-ProxyWidget::ProxyWidget(QWidget *parent)
-	: QWidget(parent)
-	, ui(new Ui::ProxyWidget)
-{
-	ui->setupUi(this);
-
-	/* Connect signals */
-	connectUi(true);
-	connect(ui->portSpinBox, (void(QSpinBox::*)(int))&QSpinBox::valueChanged, this, &ProxyWidget::changed);
-
-	/* Initialize types */
-	ui->schemeComboBox->addItem("", "");
-	ui->schemeComboBox->addItem("HTTP", "http://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("HTTP Proxy."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("HTTPS", "https://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("HTTPS Proxy."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("SOCKS4", "socks4://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS4 Proxy."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("SOCKS4a", "socks4a://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS4a Proxy. Proxy resolves URL hostname."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("SOCKS5", "socks5://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS5 Proxy."), Qt::ToolTipRole);
-	ui->schemeComboBox->addItem("SOCKS5h", "socks5h://");
-	ui->schemeComboBox->setItemData(ui->schemeComboBox->count() - 1, tr("SOCKS5 Proxy. Proxy resolves URL hostname."), Qt::ToolTipRole);
-}
-
-ProxyWidget::~ProxyWidget()
-{
-	delete ui;
-}
-
-void ProxyWidget::connectUi(bool doConnect)
-{
-	if (doConnect) {
-		if (!mAddressConnection) {
-			mAddressConnection = connect(ui->addressLineEdit, &QLineEdit::textChanged, this, &ProxyWidget::addressChanged);
-		}
-		if (!mSchemeConnection) {
-			mSchemeConnection = connect(ui->schemeComboBox, (void(QComboBox::*)(int))&QComboBox::currentIndexChanged, this, &ProxyWidget::changed);
-		}
-	} else {
-		if (mAddressConnection) {
-			disconnect(mAddressConnection);
-		}
-		if (mSchemeConnection) {
-			disconnect(mSchemeConnection);
-		}
-	}
-}
-
-QString ProxyWidget::address()
-{
-	QString host = ui->addressLineEdit->text();
-	if (host.isEmpty()) {
-		return "";
-	}
-
-	QString value;
-
-	QString scheme = ui->schemeComboBox->currentData().toString();
-	if (!scheme.isEmpty()) {
-		value = scheme;
-	}
-
-	value += ui->addressLineEdit->text();
-
-	return value;
-}
-
-void ProxyWidget::setAddress(const QString &value)
-{
-	int schemeIndex;
-	QString host;
-
-	splitAddress(value, schemeIndex, host);
-
-	connectUi(false);
-	ui->schemeComboBox->setCurrentIndex(schemeIndex);
-	ui->addressLineEdit->setText(host);
-	connectUi(true);
-}
-
-int ProxyWidget::port()
-{
-	return ui->portSpinBox->value();
-}
-
-void ProxyWidget::setPort(int value)
-{
-	ui->portSpinBox->setValue(value);
-}
-
-void ProxyWidget::addressChanged(const QString &value)
-{
-	int schemeIndex;
-	QString host;
-
-	splitAddress(value, schemeIndex, host);
-
-	connectUi(false);
-	ui->schemeComboBox->setCurrentIndex(schemeIndex);
-	if (host != ui->addressLineEdit->text()) {
-		ui->addressLineEdit->setText(host);
-	}
-	connectUi(true);
-
-	emit changed();
-}
-
-void ProxyWidget::splitAddress(const QString &value, int &schemeIndex, QString &host)
-{
-	if (value.isEmpty()) {
-		schemeIndex = ui->schemeComboBox->currentIndex();
-		host = value;
-		return;
-	}
-
-	QString scheme;
-	int index = value.indexOf("://");
-	if (index >= 0) {
-		scheme = value.left(index + 3);
-		host = value.mid(index + 3);
-	} else {
-		if (ui->schemeComboBox->currentIndex() == 0) {
-			// Default to HTTP
-			scheme = "http://";
-		} else {
-			scheme = ui->schemeComboBox->currentData().toString();
-		}
-		host = value;
-	}
-
-	schemeIndex = ui->schemeComboBox->findData(scheme);
-	if (schemeIndex < 0) {
-		/* Unknown scheme */
-		schemeIndex = 0;
-		host = value;
-	}
-}
diff --git a/plugins/FeedReader/gui/ProxyWidget.h b/plugins/FeedReader/gui/ProxyWidget.h
deleted file mode 100644
index d1fdac315..000000000
--- a/plugins/FeedReader/gui/ProxyWidget.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef PROXYWIDGET_H
-#define PROXYWIDGET_H
-
-#include <QWidget>
-
-namespace Ui {
-class ProxyWidget;
-}
-
-class ProxyWidget : public QWidget
-{
-	Q_OBJECT
-
-public:
-	explicit ProxyWidget(QWidget *parent = nullptr);
-	~ProxyWidget();
-
-	QString address();
-	void setAddress(const QString &value);
-
-	int port();
-	void setPort(int value);
-
-Q_SIGNALS:
-	void changed();
-
-private Q_SLOTS:
-	void addressChanged(const QString &value);
-
-private:
-	void connectUi(bool doConnect);
-	void splitAddress(const QString &value, int &schemeIndex, QString &host);
-
-private:
-	Ui::ProxyWidget *ui;
-	QMetaObject::Connection mAddressConnection;
-	QMetaObject::Connection mSchemeConnection;
-};
-
-#endif // PROXYWIDGET_H
diff --git a/plugins/FeedReader/gui/ProxyWidget.ui b/plugins/FeedReader/gui/ProxyWidget.ui
deleted file mode 100644
index 0671cebc3..000000000
--- a/plugins/FeedReader/gui/ProxyWidget.ui
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProxyWidget</class>
- <widget class="QWidget" name="ProxyWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>22</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true"/>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QComboBox" name="schemeComboBox"/>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="addressLineEdit"/>
-   </item>
-   <item>
-    <widget class="QLabel" name="portLabel">
-     <property name="text">
-      <string notr="true">:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QSpinBox" name="portSpinBox">
-     <property name="maximum">
-      <number>65535</number>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/plugins/FeedReader/lang/FeedReader_en.ts b/plugins/FeedReader/lang/FeedReader_en.ts
index 2fea9589e..707c8cec9 100644
--- a/plugins/FeedReader/lang/FeedReader_en.ts
+++ b/plugins/FeedReader/lang/FeedReader_en.ts
@@ -9,7 +9,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+377"/>
+        <location line="+398"/>
         <source>Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34,7 +34,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-370"/>
+        <location line="-391"/>
         <source>Authentication (not yet supported)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,7 +59,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+50"/>
         <source>Update interval</source>
         <translation type="unfinished"></translation>
     </message>
@@ -89,7 +89,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-195"/>
+        <location line="-216"/>
         <source>Storage time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -114,7 +114,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+7"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+200"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -189,7 +199,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+211"/>
         <location line="+152"/>
         <location line="+15"/>
         <source>Edit feed</source>
@@ -254,7 +264,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+7"/>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
@@ -297,12 +317,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FeedReaderDialog.cpp" line="+105"/>
+        <location filename="../gui/FeedReaderDialog.cpp" line="+101"/>
         <source>Message Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+199"/>
+        <location line="+197"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
@@ -352,7 +372,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+259"/>
+        <location line="+241"/>
         <source>Add new folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -515,7 +535,7 @@
     </message>
     <message>
         <location line="+26"/>
-        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+126"/>
+        <location filename="../gui/FeedReaderMessageWidget.cpp" line="+117"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -531,11 +551,6 @@
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+121"/>
-        <source>Copy Link Location</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/FeedReaderMessageWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -552,7 +567,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+12"/>
         <source>Open link in browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -562,7 +577,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+127"/>
         <source>The messages will be added to the forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -622,7 +637,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+374"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -942,37 +957,4 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ProxyWidget</name>
-    <message>
-        <location filename="../gui/ProxyWidget.cpp" line="+17"/>
-        <source>HTTP Proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>HTTPS Proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>SOCKS4 Proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>SOCKS4a Proxy. Proxy resolves URL hostname.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>SOCKS5 Proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>SOCKS5 Proxy. Proxy resolves URL hostname.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc
index 110d051cf..845b5c82b 100644
--- a/plugins/FeedReader/services/p3FeedReaderThread.cc
+++ b/plugins/FeedReader/services/p3FeedReaderThread.cc
@@ -848,22 +848,6 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
 
 	RsFeedReaderErrorState result = RS_FEED_ERRORSTATE_OK;
 
-	time_t minimumPubDate = 0;
-	if (feed.lastUpdate == 0) {
-		// Get all items on first scan
-	} else {
-		// Get storage time
-		uint32_t storageTime = 0;
-		if (feed.flag & RS_FEED_FLAG_STANDARD_STORAGE_TIME) {
-			storageTime = mFeedReader->getStandardStorageTime();
-		} else {
-			storageTime = feed.storageTime;
-		}
-		if (storageTime > 0) {
-			minimumPubDate = time(NULL) - storageTime;
-		}
-	}
-
 	XMLWrapper xml;
 	if (xml.readXML(feed.content.c_str())) {
 		xmlNodePtr root = xml.getRootElement();
@@ -1022,13 +1006,6 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
 							}
 						}
 
-						if (minimumPubDate) {
-							if (item->pubDate < minimumPubDate) {
-								// pubDate is less than storage time, don't add as new item
-								continue;
-							}
-						}
-
 						entries.push_back(item);
 					}
 				} else {
@@ -1120,7 +1097,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 	std::string url;
 	if (feed.flag & RS_FEED_FLAG_SAVE_COMPLETE_PAGE) {
 #ifdef FEEDREADER_DEBUG
-		std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") download page " << msg->link << std::endl;
+		std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") download page " << msg->link << std::endl;
 #endif
 		std::string content;
 		CURLWrapper CURL(proxy);
@@ -1157,7 +1134,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 
 		if (result != RS_FEED_ERRORSTATE_OK) {
 #ifdef FEEDREADER_DEBUG
-			std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot download page, CURLCode = " << code << ", error = " << errorString << std::endl;
+			std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot download page, CURLCode = " << code << ", error = " << errorString << std::endl;
 #endif
 			return result;
 		}
@@ -1303,7 +1280,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 										if (!src.empty()) {
 											/* download image */
 #ifdef FEEDREADER_DEBUG
-											std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") download image " << src << std::endl;
+											std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") download image " << src << std::endl;
 #endif
 											std::vector<unsigned char> data;
 											CURLWrapper CURL(proxy);
@@ -1371,7 +1348,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 								if (!html.saveHTML(msg->postedDescriptionWithoutFirstImage)) {
 									errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-									std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
+									std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
 									std::cerr << "  Error: " << errorString << std::endl;
 #endif
 									result = RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR;
@@ -1380,7 +1357,7 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 						} else {
 							errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-							std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
+							std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
 							std::cerr << "  Error: " << errorString << std::endl;
 #endif
 							result = RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR;
@@ -1389,14 +1366,14 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
 				}
 			} else {
 #ifdef FEEDREADER_DEBUG
-				std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") no root element" << std::endl;
+				std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") no root element" << std::endl;
 #endif
 				result = RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR;
 			}
 		} else {
 			errorString = html.lastError();
 #ifdef FEEDREADER_DEBUG
-			std::cerr << "p3FeedReaderThread::processMsg - feed " << feed.feedId << " (" << feed.name << ") cannot read html" << std::endl;
+			std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot read html" << std::endl;
 			std::cerr << "  Error: " << errorString << std::endl;
 #endif
 			result = RS_FEED_ERRORSTATE_PROCESS_HTML_ERROR;
diff --git a/plugins/VOIP/gui/QVideoDevice.cpp b/plugins/VOIP/gui/QVideoDevice.cpp
index fb81b84e2..51e3a83bf 100644
--- a/plugins/VOIP/gui/QVideoDevice.cpp
+++ b/plugins/VOIP/gui/QVideoDevice.cpp
@@ -37,7 +37,6 @@ QVideoInputDevice::QVideoInputDevice(QWidget *parent)
 	_capture_device = NULL ;
 	_video_processor = NULL ;
 	_echo_output_device = NULL ;
-	_image_capture = NULL;
 }
 
 QVideoInputDevice::~QVideoInputDevice()
diff --git a/retroshare-friendserver/src/friendserver.cc b/retroshare-friendserver/src/friendserver.cc
index 3c80bba83..19c286256 100644
--- a/retroshare-friendserver/src/friendserver.cc
+++ b/retroshare-friendserver/src/friendserver.cc
@@ -8,11 +8,7 @@
 
 #include "pgp/pgpkeyutil.h"
 #include "pgp/rscertificate.h"
-#ifdef USE_OPENPGPSDK
 #include "pgp/openpgpsdkhandler.h"
-#else
-#include "pgp/rnppgphandler.h"
-#endif
 
 #include "friendserver.h"
 #include "friend_server/fsitem.h"
@@ -397,11 +393,7 @@ FriendServer::FriendServer(const std::string& base_dir,const std::string& listen
     std::string pgp_private_keyring_path = RsDirUtil::makePath(base_dir,"pgp_private_keyring") ;	// not used.
     std::string pgp_trustdb_path         = RsDirUtil::makePath(base_dir,"pgp_trustdb") ;	        // not used.
 
-#ifdef USE_OPENPGPSDK
     mPgpHandler = new OpenPGPSDKHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
-#else
-    mPgpHandler = new RNPPGPHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
-#endif
 
     // Random bias. Should be cryptographically safe.
 
diff --git a/retroshare-gui/src/README.txt b/retroshare-gui/src/README.txt
index 231d16b23..7f7f35c8e 100644
--- a/retroshare-gui/src/README.txt
+++ b/retroshare-gui/src/README.txt
@@ -2,14 +2,17 @@
 README for RetroShare
 =======================================================================================
 
-RetroShare web site . . . . https://retroshare.cc/
+RetroShare web site . . . . http://retroshare.net/index.html
 Developer's blog  . . . . . https://retroshareteam.wordpress.com
-Documentation . . . . . . . https://retrosharedocs.readthedocs.io/en/latest/
+Documentation . . . . . . . https://retroshare.readthedocs.io/en/latest/
+Support . . . . . . . . . . http://retroshare.net/support.html
+Forums  . . . . . . . . . . http://retroshare.sourceforge.net/forum/
 Wiki  . . . . . . . . . . . https://github.com/RetroShare/documentation/wiki 
+Old developers site . . . . http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner
 Project site  . . . . . . . https://github.com/RetroShare/RetroShare
-Related projects/plugins . .https://github.com/RetroShare
+Relted projects/plugins . . https://github.com/RetroShare
 
-Contact:  . . . . . . . . . retroshare.project@gmail.com
+Contact:  . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net
 
 =========================================================================================
 Compiling RetroShare
@@ -19,9 +22,9 @@ Build Scripts are avaible on GIT:
 https://github.com/RetroShare/RetroShare/tree/master/build_scripts
 
 You can find here instructions howto compile RetroShare:
-https://retrosharedocs.readthedocs.io/en/latest/developer/compilation/
+https://retroshare.readthedocs.io/en/latest/developer/compilation/
 
-You can go on over to our forum or chat room when you have trouble with compiling:
+You can go on over to our forum or chat lobby when you have trouble with compiling:
 retroshare://forum?name=Developers%20Discussions&id=8fd22bd8f99754461e7ba1ca8a727995
 retroshare://chat_room?name=Retroshare%20Devel%20%28signed%29&id=L68DB0A1E09BDA3A5
-
+http://retroshare.sourceforge.net/forum/
diff --git a/retroshare-gui/src/gui/AboutWidget.cpp b/retroshare-gui/src/gui/AboutWidget.cpp
index 1c4ae6827..b468550b1 100644
--- a/retroshare-gui/src/gui/AboutWidget.cpp
+++ b/retroshare-gui/src/gui/AboutWidget.cpp
@@ -142,7 +142,7 @@ void AboutWidget::updateTitle()
 {
     if (tWidget == NULL)
     {
-        setWindowTitle(QString("%1 %2").arg(tr("About RetroShare"), RsApplication::retroshareVersion(true)));
+        setWindowTitle(QString("%1 %2").arg(tr("About RetroShare"), Rshare::retroshareVersion(true)));
     }
     else
     {
@@ -228,7 +228,7 @@ void AWidget::initImages()
 #ifdef RS_ONLYHIDDENNODE
     p.drawText(QPointF(10, 50), QString("%1 : %2 (With embedded Tor)").arg(tr("Retroshare version"), Rshare::retroshareVersion(true)));
 #else
-    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("Retroshare version"), RsApplication::retroshareVersion(true)));
+    p.drawText(QPointF(10, 50), QString("%1 : %2").arg(tr("Retroshare version"), Rshare::retroshareVersion(true)));
 #endif
 
     /* Draw Qt's version number */
@@ -936,7 +936,7 @@ void AboutWidget::on_copy_button_clicked()
 {
 	QString verInfo;
 	QString rsVerString = "RetroShare Version: ";
-    rsVerString+=RsApplication::retroshareVersion(true);
+	rsVerString+=Rshare::retroshareVersion(true);
 	verInfo+=rsVerString;
 #ifdef RS_ONLYHIDDENNODE
 	verInfo+=" " + tr("Only Hidden Node");
diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
index 60ed255a8..0b5350110 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@@ -143,28 +143,28 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
 	QHeaderView_setSectionResizeModeColumn(header, COLUMN_TOPIC, QHeaderView::Interactive);
 
     privateSubLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-    privateSubLobbyItem->setText(COLUMN_NAME, tr("Private Subscribed"));
+    privateSubLobbyItem->setText(COLUMN_NAME, tr("Private Subscribed chat rooms"));
 	privateSubLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "1");
 	//	privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
     privateSubLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE);
 	ui.lobbyTreeWidget->insertTopLevelItem(0, privateSubLobbyItem);
 
 	publicSubLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed"));
+	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed chat rooms"));
 	publicSubLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "2");
 	//	publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
     publicSubLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC);
 	ui.lobbyTreeWidget->insertTopLevelItem(1, publicSubLobbyItem);
 
 	privateLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	privateLobbyItem->setText(COLUMN_NAME, tr("Private"));
+	privateLobbyItem->setText(COLUMN_NAME, tr("Private chat rooms"));
 	privateLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "3");
 	//	privateLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PRIVATE));
     privateLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PRIVATE);
 	ui.lobbyTreeWidget->insertTopLevelItem(2, privateLobbyItem);
 
 	publicLobbyItem = new RSTreeWidgetItem(compareRole, TYPE_FOLDER);
-	publicLobbyItem->setText(COLUMN_NAME, tr("Public"));
+	publicLobbyItem->setText(COLUMN_NAME, tr("Public chat rooms"));
 	publicLobbyItem->setData(COLUMN_NAME, ROLE_SORT, "4");
 	//	publicLobbyItem->setIcon(COLUMN_NAME, QIcon(IMAGE_PUBLIC));
     publicLobbyItem->setData(COLUMN_DATA, ROLE_PRIVACYLEVEL, CHAT_LOBBY_PRIVACY_LEVEL_PUBLIC);
@@ -230,8 +230,6 @@ ChatLobbyWidget::ChatLobbyWidget(QWidget *parent, Qt::WindowFlags flags)
 	
 	int ltwH = misc::getFontSizeFactor("LobbyTreeWidget", 1.5).height();
 	ui.lobbyTreeWidget->setIconSize(QSize(ltwH,ltwH));
-
-	mFontSizeHandler.registerFontSize(ui.lobbyTreeWidget);
 }
 
 ChatLobbyWidget::~ChatLobbyWidget()
@@ -422,7 +420,7 @@ static void updateItem(QTreeWidget *treeWidget, QTreeWidgetItem *item, ChatLobby
     if(lobby_flags & RS_CHAT_LOBBY_FLAGS_PGP_SIGNED)
 	{
         tooltipstr += QObject::tr("\nSecurity: no anonymous IDs") ;
-		QColor foreground = QColor(16, 157, 0); // green
+		QColor foreground = QColor(0, 128, 0); // green
 		for (int column = 0; column < COLUMN_COUNT; ++column)
 			item->setData(column, Qt::ForegroundRole, foreground);
 	}
@@ -723,9 +721,9 @@ void ChatLobbyWidget::updateDisplay()
         }
 	}
 	publicSubLobbyItem->setHidden(publicSubLobbyItem->childCount()==0);
-	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed")+ QString(" (") + QString::number(publicSubLobbyItem->childCount())+QString(")"));
+	publicSubLobbyItem->setText(COLUMN_NAME, tr("Public Subscribed chat rooms")+ QString(" (") + QString::number(publicSubLobbyItem->childCount())+QString(")"));
 	privateSubLobbyItem->setHidden(privateSubLobbyItem->childCount()==0);
-	publicLobbyItem->setText(COLUMN_NAME, tr("Public")+ " (" + QString::number(publicLobbyItem->childCount())+QString(")"));
+	publicLobbyItem->setText(COLUMN_NAME, tr("Public chat rooms")+ " (" + QString::number(publicLobbyItem->childCount())+QString(")"));
 }
 
 void ChatLobbyWidget::createChatLobby()
diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.h b/retroshare-gui/src/gui/ChatLobbyWidget.h
index 424780dac..a5055788e 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.h
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.h
@@ -25,7 +25,6 @@
 
 #include "chat/ChatLobbyUserNotify.h"
 #include "gui/gxs/GxsIdChooser.h"
-#include "util/FontSizeHandler.h"
 
 
 #include <retroshare/rsmsgs.h>
@@ -147,8 +146,6 @@ private:
 	QAbstractButton* myInviteYesButton;
 	GxsIdChooser* myInviteIdChooser;
 
-	FontSizeHandler mFontSizeHandler;
-
 	/* UI - from Designer */
 	Ui::ChatLobbyWidget ui;
 };
diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui
index b2f711b72..8f8e8f29d 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.ui
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui
@@ -73,7 +73,7 @@
        <widget class="QLabel" name="titleBarLabel">
         <property name="font">
          <font>
-	   <pointsize>12</pointsize>
+          <pointsize>12</pointsize>
           <weight>75</weight>
           <bold>true</bold>
          </font>
@@ -191,6 +191,11 @@
        </item>
        <item>
         <widget class="RSTreeWidget" name="lobbyTreeWidget">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
          <property name="iconSize">
           <size>
            <width>16</width>
@@ -459,7 +464,7 @@
   <customwidget>
    <class>LineEditClear</class>
    <extends>QLineEdit</extends>
-   <header>gui/common/LineEditClear.h</header>
+   <header location="global">gui/common/LineEditClear.h</header>
   </customwidget>
   <customwidget>
    <class>RSTreeWidget</class>
diff --git a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
old mode 100755
new mode 100644
index 319c284d5..3fc982012
--- a/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp
@@ -102,7 +102,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
         case COLUMN_REMAINING:
 			remaining = index.data().toLongLong();
@@ -121,7 +121,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
         case COLUMN_COMPLETED:
 			completed = index.data().toLongLong();
@@ -140,7 +140,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
         case COLUMN_DLSPEED:
                         dlspeed = index.data().toDouble();
@@ -151,7 +151,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                             temp.sprintf("%.2f", dlspeed/1024.);
                             temp += " KB/s";
                         }
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
         case COLUMN_PROGRESS:
 			{
@@ -236,7 +236,7 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
 				p.setX( p.x() + pixOffset);
 				painter->drawPixmap(p, pixmap);
 				temp = " " + temp;
@@ -247,13 +247,13 @@ void DLListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
 				p.setX( p.x() + pixOffset);
 				painter->drawPixmap(p, pixmap);
 				temp = " " + temp;
 				pixOffset += pixmap.size().width();
 			}
-			painter->drawText(option.rect.translated(pixOffset, 0), Qt::AlignLeft | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect.translated(pixOffset, 0), Qt::AlignLeft, temp);
 		}
 		break;
     case COLUMN_LASTDL:
@@ -279,7 +279,7 @@ QSize DLListDelegate::sizeHint(const QStyleOptionViewItem & option, const QModel
 {
     float w = QFontMetricsF(option.font).width(index.data(Qt::DisplayRole).toString());
 
-    int S = QFontMetricsF(option.font).height()*1.5 ;
+    int S = QFontMetricsF(option.font).height() ;
     return QSize(w,S);
 }
 
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 0af441dd5..832970833 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -30,7 +30,7 @@
 #include "gui/RetroShareLink.h"
 #include "retroshare-gui/RsAutoUpdatePage.h"
 #include "gui/msgs/MessageComposer.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "gui/common/FilesDefs.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/settings/rsharesettings.h"
@@ -38,7 +38,6 @@
 #include "gui/common/RSTreeWidgetItem.h"
 #include "util/QtVersion.h"
 #include "util/qtthreadsutils.h"
-#include "util/misc.h"
 
 #include <retroshare/rsfiles.h>
 #include <retroshare/rsturtle.h>
@@ -202,6 +201,10 @@ SearchDialog::SearchDialog(QWidget *parent)
 
     ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder);
 
+    QFontMetricsF fontMetrics(ui.searchResultWidget->font());
+    int iconHeight = fontMetrics.height() * 1.4;
+    ui.searchResultWidget->setIconSize(QSize(iconHeight, iconHeight));
+
     /* Set initial size the splitter */
     QList<int> sizes;
     sizes << 250 << width(); // Qt calculates the right sizes
@@ -236,8 +239,6 @@ SearchDialog::SearchDialog(QWidget *parent)
         RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
     }, mEventHandlerId, RsEventType::FILE_TRANSFER );
 
-    mFontSizeHandler.registerFontSize(ui.searchSummaryWidget);
-    mFontSizeHandler.registerFontSize(ui.searchResultWidget, 1.4f);
 }
 
 SearchDialog::~SearchDialog()
@@ -324,7 +325,7 @@ void SearchDialog::checkText(const QString& txt)
 	ui.searchButton->setDisabled(txt.length() < 3);
 	ui.searchLineFrame->setProperty("valid", (txt.length() >= 3));
 	ui.searchLineFrame->style()->unpolish(ui.searchLineFrame);
-	RsApplication::refreshStyleSheet(ui.searchLineFrame, false);
+	Rshare::refreshStyleSheet(ui.searchLineFrame, false);
 }
 
 void SearchDialog::initialiseFileTypeMappings()
@@ -496,23 +497,25 @@ void SearchDialog::collCreate()
 	int selectedCount = selectedItems.size() ;
 	QTreeWidgetItem * item ;
 
-    RsFileTree tree;
-
-    for (int i = 0; i < selectedCount; ++i)
-    {
+	for (int i = 0; i < selectedCount; ++i) {
 		item = selectedItems.at(i) ;
 
-        if (!item->text(SR_HASH_COL).isEmpty())
-        {
+		if (!item->text(SR_HASH_COL).isEmpty()) {
 			std::string name = item->text(SR_NAME_COL).toUtf8().constData();
 			RsFileHash hash( item->text(SR_HASH_COL).toStdString() );
 			uint64_t count = item->text(SR_SIZE_COL).toULongLong();
 
-            tree.addFile(tree.root(),name,hash,count);
+			DirDetails details;
+			details.name = name;
+			details.hash = hash;
+            details.size = count;
+			details.type = DIR_TYPE_FILE;
+
+			dirVec.push_back(details);
 		}
 	}
 
-    RsCollectionDialog::openNewCollection(tree);
+	RsCollection(dirVec,RS_FILE_HINTS_LOCAL).openNewColl(this);
 }
 
 void SearchDialog::collModif()
@@ -539,8 +542,12 @@ void SearchDialog::collModif()
 	/* open file with a suitable application */
 	QFileInfo qinfo;
 	qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-            RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
+	if (qinfo.exists()) {
+		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+			RsCollection collection;
+			collection.openColl(qinfo.absoluteFilePath());
+		}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
+	}//if (qinfo.exists())
 }
 
 void SearchDialog::collView()
@@ -567,8 +574,12 @@ void SearchDialog::collView()
 	/* open file with a suitable application */
 	QFileInfo qinfo;
 	qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-        RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
+	if (qinfo.exists()) {
+		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+			RsCollection collection;
+			collection.openColl(qinfo.absoluteFilePath(), true);
+		}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
+	}//if (qinfo.exists())
 }
 
 void SearchDialog::collOpen()
@@ -586,35 +597,32 @@ void SearchDialog::collOpen()
 
 			if (rsFiles->FileDetails(hash, RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL
 			                               | RS_FILE_HINTS_BROWSABLE | RS_FILE_HINTS_NETWORK_WIDE
-                                     | RS_FILE_HINTS_SPEC_ONLY, info))
-            {
+                                     | RS_FILE_HINTS_SPEC_ONLY, info)) {
+
 				/* make path for downloaded files */
 				std::string path;
 				path = info.path;
 
 				/* open file with a suitable application */
 				QFileInfo qinfo;
-                RsCollection::RsCollectionErrorCode err;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                    RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),err));
+				if (qinfo.exists()) {
+					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+						RsCollection collection;
+						if (collection.load(qinfo.absoluteFilePath())) {
+							collection.downloadFiles();
+							return;
+						}
+					}
+				}
 			}
 		}
 	}
 
-    QString fileName;
-    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-        return ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    RsCollection::RsCollectionErrorCode err;
-    RsCollection collection(fileName, err);
-
-    if(err == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
-        RsCollectionDialog::downloadFiles(collection);
-    else
-        QMessageBox::information(nullptr,tr("Error open RsCollection file"),RsCollection::errorString(err));
+	RsCollection collection;
+	if (collection.load(this)) {
+		collection.downloadFiles();
+	}//if (collection.load(this))
 }
 
 void SearchDialog::downloadDirectory(const QTreeWidgetItem *item, const QString &base)
@@ -898,7 +906,7 @@ void SearchDialog::searchKeywords(const QString& keywords)
 	if (keywords.length() < 3)
 		return ;
 
-	QStringList qWords = keywords.split(" ", QtSkipEmptyParts);
+	QStringList qWords = keywords.split(" ", QString::SkipEmptyParts);
 	std::list<std::string> words;
 	QStringListIterator qWordsIter(qWords);
 	while (qWordsIter.hasNext())
@@ -1040,7 +1048,7 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons
 
 		child->setText(SR_SOURCES_COL, QString::number(1));
 		child->setData(SR_SOURCES_COL, ROLE_SORT, 1);
-		child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight | Qt::AlignVCenter );
+		child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight );
 
 		child->setText(SR_SEARCH_ID_COL, sid_hexa);
 		setIconAndType(child, QString::fromUtf8(dir.name.c_str()));
@@ -1065,7 +1073,7 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons
 		child->setTextAlignment( SR_SIZE_COL, Qt::AlignRight );
 		child->setText(SR_SOURCES_COL, QString::number(1));
 		child->setData(SR_SOURCES_COL, ROLE_SORT, 1);
-		child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight | Qt::AlignVCenter );
+		child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight );
 		child->setText(SR_SEARCH_ID_COL, sid_hexa);
 		child->setText(SR_TYPE_COL, tr("Folder"));
 
@@ -1134,7 +1142,7 @@ void SearchDialog::insertDirectory(const QString &txt, qulonglong searchId, cons
     child->setTextAlignment( SR_SIZE_COL, Qt::AlignRight );
     child->setText(SR_SOURCES_COL, QString::number(1));
     child->setData(SR_SOURCES_COL, ROLE_SORT, 1);
-    child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight | Qt::AlignVCenter );
+    child->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight );
     child->setText(SR_SEARCH_ID_COL, sid_hexa);
     child->setText(SR_TYPE_COL, tr("Folder"));
 
@@ -1236,7 +1244,7 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s
 			int friendSource = 0;
 			int anonymousSource = 0;
 			QString resultCount = it->text(SR_SOURCES_COL);
-			QStringList modifiedResultCount = resultCount.split("/", QtSkipEmptyParts);
+			QStringList modifiedResultCount = resultCount.split("/", QString::SkipEmptyParts);
 			if(searchType == FRIEND_SEARCH)
 			{
 				friendSource = modifiedResultCount.at(0).toInt() + 1;
@@ -1326,11 +1334,9 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s
 
 		item->setText(SR_SIZE_COL, QString::number(file.size));
 		item->setData(SR_SIZE_COL, ROLE_SORT, (qulonglong) file.size);
-		item->setText(SR_AGE_COL, QString::number(file.mtime));
-		item->setData(SR_AGE_COL, ROLE_SORT, file.mtime);
+        item->setText(SR_AGE_COL, QString::number(file.mtime));
+        item->setData(SR_AGE_COL, ROLE_SORT, file.mtime);
 		item->setTextAlignment( SR_SIZE_COL, Qt::AlignRight );
-		item->setTextAlignment( SR_AGE_COL, Qt::AlignCenter );
-
 		int friendSource = 0;
 		int anonymousSource = 0;
 		if(searchType == FRIEND_SEARCH)
@@ -1349,7 +1355,7 @@ void SearchDialog::insertFile(qulonglong searchId, const FileDetail& file, int s
 		item->setText(SR_SOURCES_COL,modifiedResult);
 		item->setToolTip(SR_SOURCES_COL, tr("Obtained via ")+QString::fromStdString(rsPeers->getPeerName(file.id)) );
 		item->setData(SR_SOURCES_COL, ROLE_SORT, fltRes);
-		item->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight | Qt::AlignVCenter );
+		item->setTextAlignment( SR_SOURCES_COL, Qt::AlignRight );
 		item->setText(SR_SEARCH_ID_COL, sid_hexa);
 
 		QColor foreground;
diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
index 0af53662b..8aa7bac64 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
@@ -25,7 +25,6 @@
 #include "retroshare/rsevents.h"
 #include "ui_SearchDialog.h"
 #include "retroshare-gui/mainpage.h"
-#include "util/FontSizeHandler.h"
 
 class AdvancedSearchDialog;
 class RSTreeWidgetItemCompareRole;
@@ -174,8 +173,6 @@ private:
 	QAction *collViewAct;
 	QAction *collOpenAct;
 
-	FontSizeHandler mFontSizeHandler;
-
 /** Qt Designer generated object */
     Ui::SearchDialog ui;
 
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
index 2a8a6b58f..74a7d5744 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
@@ -27,7 +27,7 @@
 #include "gui/RetroShareLink.h"
 #include "gui/ShareManager.h"
 #include "gui/common/PeerDefs.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/gxschannels/GxsChannelDialog.h"
 #include "gui/gxsforums/GxsForumsDialog.h"
@@ -652,7 +652,7 @@ void SharedFilesDialog::copyLinks(const QModelIndexList& lst, bool remote,QList<
 
             QString dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
 
-            RetroShareLink link = RetroShareLink::createFileTree(dir_name,ft->totalFileSize(),ft->numFiles(),QString::fromStdString(ft->toRadix64())) ;
+            RetroShareLink link = RetroShareLink::createFileTree(dir_name,ft->mTotalSize,ft->mTotalFiles,QString::fromStdString(ft->toRadix64())) ;
 
 			if(link.valid())
 				urls.push_back(link) ;
@@ -734,32 +734,7 @@ void SharedFilesDialog::sendLinkTo()
 void SharedFilesDialog::collCreate()
 {
     QModelIndexList lst = getSelected();
-
-    std::vector <DirDetails> dirVec;
-    model->getDirDetailsFromSelect(lst, dirVec);
-
-    auto RemoteMode = isRemote();
-    FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
-
-    QString dir_name;
-
-    if(!RemoteMode)
-    {
-        if(!dirVec.empty())
-        {
-            const DirDetails& details = dirVec[0];
-            dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
-        }
-    }
-
-    RsFileTree tree;
-
-    for(uint32_t i=0;i<dirVec.size();++i)
-        tree.addFileTree(tree.root(),*RsFileTree::fromDirDetails(dirVec[i],RemoteMode,true));
-
-    RsCollectionDialog::openNewCollection(tree);
-
-            //auto ft = RsFileTree::fromDirDetails(details,remote);
+    model->createCollectionFile(this, lst);
 }
 
 void SharedFilesDialog::collModif()
@@ -784,8 +759,12 @@ void SharedFilesDialog::collModif()
     /* open file with a suitable application */
     QFileInfo qinfo;
     qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-            RsCollectionDialog::editExistingCollection(qinfo.absoluteFilePath());
+    if (qinfo.exists()) {
+        if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+            RsCollection collection;
+            collection.openColl(qinfo.absoluteFilePath());
+        }
+    }
 }
 
 void SharedFilesDialog::collView()
@@ -810,8 +789,12 @@ void SharedFilesDialog::collView()
     /* open file with a suitable application */
     QFileInfo qinfo;
     qinfo.setFile(QString::fromUtf8(path.c_str()));
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-        RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
+    if (qinfo.exists()) {
+        if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+            RsCollection collection;
+            collection.openColl(qinfo.absoluteFilePath(), true);
+        }
+    }
 }
 
 void SharedFilesDialog::collOpen()
@@ -838,24 +821,20 @@ void SharedFilesDialog::collOpen()
             qinfo.setFile(QString::fromUtf8(path.c_str()));
             if (qinfo.exists()) {
                 if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
-
-                    RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(),true);
+                    RsCollection collection;
+                    if (collection.load(qinfo.absoluteFilePath())) {
+                        collection.downloadFiles();
+                        return;
+                    }
                 }
             }
         }
     }
 
-    QString fileName;
-    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-        return ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    RsCollection::RsCollectionErrorCode err;
-    RsCollection collection(fileName,err);
-
-    if(err == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
-        RsCollectionDialog::downloadFiles(collection);
+    RsCollection collection;
+    if (collection.load(this)) {
+        collection.downloadFiles();
+    }
 }
 
 void LocalSharedFilesDialog::playselectedfiles()
@@ -1166,14 +1145,12 @@ void LocalSharedFilesDialog::spawnCustomPopupMenu( QPoint point )
     collViewAct->setEnabled(bIsRsColl);
     collOpenAct->setEnabled(true);
 
-    QMenu collectionMenu(tr("Retroshare Collection"), this);
+    QMenu collectionMenu(tr("Collection"), this);
     collectionMenu.setIcon(QIcon(IMAGE_LIBRARY));
     collectionMenu.addAction(collCreateAct);
-
-    if(bIsRsColl)
-        collectionMenu.addAction(collModifAct);
-    //collectionMenu.addAction(collViewAct);
-    //collectionMenu.addAction(collOpenAct);
+    collectionMenu.addAction(collModifAct);
+    collectionMenu.addAction(collViewAct);
+    collectionMenu.addAction(collOpenAct);
 
     switch (type) {
         case DIR_TYPE_DIR :
@@ -1619,7 +1596,7 @@ void SharedFilesDialog::FilterItems()
         return ;
 
     //FileSearchFlags flags = isRemote()?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL;
-    QStringList lst = text.split(" ",QtSkipEmptyParts) ;
+    QStringList lst = text.split(" ",QString::SkipEmptyParts) ;
     std::list<std::string> keywords ;
 
     for(auto it(lst.begin());it!=lst.end();++it)
@@ -1711,16 +1688,12 @@ bool SharedFilesDialog::tree_FilterItem(const QModelIndex &index, const QString
 
 void SharedFilesDialog::updateFontSize()
 {
-#if defined(Q_OS_DARWIN)
-    int customFontSize = Settings->valueFromGroup("File", "MinimumFontSize", 13).toInt();
-#else
     int customFontSize = Settings->valueFromGroup("File", "MinimumFontSize", 11).toInt();
-#endif
     QFont newFont = ui.dirTreeView->font();
     if (newFont.pointSize() != customFontSize) {
         newFont.setPointSize(customFontSize);
         QFontMetricsF fontMetrics(newFont);
-        int iconHeight = fontMetrics.height()*1.5;
+        int iconHeight = fontMetrics.height();
         ui.dirTreeView->setFont(newFont);
         ui.dirTreeView->setIconSize(QSize(iconHeight, iconHeight));
     }
diff --git a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
index 4c8f8c38b..cd79340dd 100644
--- a/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
+++ b/retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.ui
@@ -23,10 +23,10 @@
       </sizepolicy>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <property name="leftMargin">
@@ -399,8 +399,8 @@ border-image: url(:/images/closepressed.png)
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 3ee120162..6fc45a070 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -24,7 +24,7 @@
 #include "gui/SoundManager.h"
 #include "gui/RetroShareLink.h"
 #include "gui/common/FilesDefs.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "gui/common/RSTreeView.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/FileTransfer/DetailsDialog.h"
@@ -1975,7 +1975,7 @@ void TransfersDialog::pasteLink()
 	for(auto &it : links)
 		col.merge_in(it.name(),it.size(),RsFileHash(it.hash().toStdString())) ;
 
-    RsCollectionDialog::downloadFiles(col);
+	col.downloadFiles();
 }
 
 void TransfersDialog::getDLSelectedItems(std::set<RsFileHash> *ids, std::set<int> *rows)
@@ -2466,17 +2466,21 @@ void TransfersDialog::collCreate()
 	std::set<RsFileHash>::iterator it ;
 	getDLSelectedItems(&items, NULL);
 
-    RsFileTree tree;
-
 	for (it = items.begin(); it != items.end(); ++it)
 	{
 		FileInfo info;
 		if (!rsFiles->FileDetails(*it, RS_FILE_HINTS_DOWNLOAD, info)) continue;
 
-        tree.addFile(tree.root(),info.fname,info.hash,info.size);
+		DirDetails details;
+		details.name = info.fname;
+		details.hash = info.hash;
+        details.size = info.size;
+		details.type = DIR_TYPE_FILE;
+
+		dirVec.push_back(details);
 	}
 
-    RsCollectionDialog::openNewCollection(tree);
+	RsCollection(dirVec,RS_FILE_HINTS_LOCAL).openNewColl(this);
 }
 
 void TransfersDialog::collModif()
@@ -2500,8 +2504,12 @@ void TransfersDialog::collModif()
 		/* open collection */
 		QFileInfo qinfo;
 		qinfo.setFile(QString::fromUtf8(path.c_str()));
-        if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
+		if (qinfo.exists()) {
+			if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+				RsCollection collection;
+				collection.openColl(qinfo.absoluteFilePath());
+			}
+		}
 	}
 }
 
@@ -2526,8 +2534,12 @@ void TransfersDialog::collView()
 		/* open collection  */
 		QFileInfo qinfo;
 		qinfo.setFile(QString::fromUtf8(path.c_str()));
-        if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath(), true);
+		if (qinfo.exists()) {
+			if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+				RsCollection collection;
+				collection.openColl(qinfo.absoluteFilePath(), true);
+			}
+		}
 	}
 }
 
@@ -2552,29 +2564,23 @@ void TransfersDialog::collOpen()
 				/* open file with a suitable application */
 				QFileInfo qinfo;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                {
-                        RsCollection::RsCollectionErrorCode code;
-                        RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),code));
-                        return;
-                }
+				if (qinfo.exists()) {
+					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+						RsCollection collection;
+						if (collection.load(qinfo.absoluteFilePath())) {
+							collection.downloadFiles();
+							return;
+						}
+					}
+				}
 			}
 		}
 	}
 
-    QString fileName;
-    if (!misc::getOpenFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
-        return ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    RsCollection::RsCollectionErrorCode code;
-    RsCollection collection(fileName,code);
-
-    if(code == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
-        RsCollectionDialog::downloadFiles(collection);
-    else
-        QMessageBox::information(nullptr,tr("Error openning collection file"),RsCollection::errorString(code));
+	RsCollection collection;
+	if (collection.load(this)) {
+		collection.downloadFiles();
+	}
 }
 
 void TransfersDialog::collAutoOpen(const QString &fileHash)
@@ -2586,18 +2592,21 @@ void TransfersDialog::collAutoOpen(const QString &fileHash)
 		if (rsFiles->FileDetails(hash, RS_FILE_HINTS_DOWNLOAD, info)) {
 
 			/* make path for downloaded files */
-            if (info.downloadStatus == FT_STATE_COMPLETE)
-            {
+			if (info.downloadStatus == FT_STATE_COMPLETE) {
 				std::string path;
 				path = info.path + "/" + info.fname;
 
 				/* open file with a suitable application */
 				QFileInfo qinfo;
 				qinfo.setFile(QString::fromUtf8(path.c_str()));
-                RsCollection::RsCollectionErrorCode err;
-
-                if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-                    RsCollectionDialog::downloadFiles(RsCollection(qinfo.absoluteFilePath(),err));
+				if (qinfo.exists()) {
+					if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+						RsCollection collection;
+						if (collection.load(qinfo.absoluteFilePath(), false)) {
+							collection.autoDownloadFiles();
+						}
+					}
+				}
 			}
 		}
 	}
diff --git a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
old mode 100755
new mode 100644
index 8bddc5017..6bad045e0
--- a/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp
@@ -101,7 +101,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
         case COLUMN_UTRANSFERRED:
 			transferred = index.data().toLongLong();
@@ -120,7 +120,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 					multi *= 1024.0;
 				}
 			}
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
         case COLUMN_ULSPEED:
                         ulspeed = index.data().toDouble();
@@ -131,7 +131,7 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
                             temp.sprintf("%.2f", ulspeed/1024.);
                             temp += " KB/s";
                         }
-			painter->drawText(option.rect, Qt::AlignRight | Qt::AlignVCenter, temp);
+			painter->drawText(option.rect, Qt::AlignRight, temp);
 			break;
         case COLUMN_UPROGRESS:
 			{
@@ -164,10 +164,10 @@ void ULListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opti
 			pixmap = qvariant_cast<QIcon>(value).pixmap(option.decorationSize, option.state & QStyle::State_Enabled ? QIcon::Normal : QIcon::Disabled, option.state & QStyle::State_Open ? QIcon::On : QIcon::Off);
 			pixmapRect = (pixmap.isNull() ? QRect(0, 0, 0, 0): QRect(QPoint(0, 0), option.decorationSize));
 			if (pixmapRect.isValid()){
-				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft | Qt::AlignVCenter, pixmap.size(), option.rect).topLeft();
+				QPoint p = QStyle::alignedRect(option.direction, Qt::AlignLeft, pixmap.size(), option.rect).topLeft();
 				painter->drawPixmap(p, pixmap);
 			}
-			painter->drawText(option.rect.translated(pixmap.size().width(), 0), Qt::AlignLeft | Qt::AlignVCenter, index.data().toString());
+			painter->drawText(option.rect.translated(pixmap.size().width(), 0), Qt::AlignLeft, index.data().toString());
 			break;
 		default:
 			painter->drawText(option.rect, Qt::AlignCenter, index.data().toString());
@@ -181,7 +181,7 @@ QSize ULListDelegate::sizeHint(const QStyleOptionViewItem & option, const QModel
 {
     float w = QFontMetricsF(option.font).width(index.data(Qt::DisplayRole).toString());
 
-    int S = QFontMetricsF(option.font).height()*1.5 ;
+    int S = QFontMetricsF(option.font).height() ;
     return QSize(w,S);
 }
 
diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui
index a8e8217fc..02408e382 100644
--- a/retroshare-gui/src/gui/FriendsDialog.ui
+++ b/retroshare-gui/src/gui/FriendsDialog.ui
@@ -102,7 +102,7 @@
          <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
-         <iconset resource="icons.qrc">
+         <iconset resource="images.qrc">
           <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
         </property>
         <property name="checkable">
@@ -132,10 +132,10 @@
           <string notr="true"/>
          </property>
          <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QGridLayout" name="headerBFrame_GL">
           <property name="leftMargin">
@@ -401,8 +401,8 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="icons.qrc"/>
   <include location="images.qrc"/>
+  <include location="icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index 0f318049d..d3b755f0d 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -251,7 +251,7 @@ void GenCertDialog::initKeyList()
 
 void GenCertDialog::mouseMoveEvent(QMouseEvent *e)
 {
-    //std::cerr << "Mouse : " << e->x() << ", " << e->y() << std::endl;
+	std::cerr << "Mouse : " << e->x() << ", " << e->y() << std::endl;
 
 	QDialog::mouseMoveEvent(e) ;
 }
@@ -649,7 +649,7 @@ void GenCertDialog::genPerson()
 	{
 		/* complete the process */
 		RsInit::LoadPassword(sslPasswd);
-		if (RsApplication::loadCertificate(sslId, false)) {
+		if (Rshare::loadCertificate(sslId, false)) {
 
             // Normally we should clear the cached passphrase as soon as possible. However,some other GUI components may still need it at start.
             // (csoler) This is really bad: we have to guess that 30 secs will be enough. I have no better way to do this.
diff --git a/retroshare-gui/src/gui/GetStartedDialog.cpp b/retroshare-gui/src/gui/GetStartedDialog.cpp
index 399cc36d7..e3bbd7170 100644
--- a/retroshare-gui/src/gui/GetStartedDialog.cpp
+++ b/retroshare-gui/src/gui/GetStartedDialog.cpp
@@ -421,7 +421,7 @@ void GetStartedDialog::emailSupport()
 	sysVersion = "Linux";
   #endif
 #endif
-	text += QString("My RetroShare Configuration is: (%1, %2, %3)").arg(RsApplication::retroshareVersion(true)
+	text += QString("My RetroShare Configuration is: (%1, %2, %3)").arg(Rshare::retroshareVersion(true)
 	                                                                    , sysVersion
 	                                                                    ).arg(static_cast<typename std::underlying_type<RsConfigUserLvl>::type>(userLevel)) + "\n";
 	text += "\n";
diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp
index ddaf925d4..cc3f1d407 100644
--- a/retroshare-gui/src/gui/HelpDialog.cpp
+++ b/retroshare-gui/src/gui/HelpDialog.cpp
@@ -80,7 +80,7 @@ HelpDialog::HelpDialog(QWidget *parent) :
 		ui->thanks->setHtml(in.readAll());
 	}
 
-	ui->version->setText(RsApplication::retroshareVersion(true));
+	ui->version->setText(Rshare::retroshareVersion(true));
 
 	/* Add version numbers of libretroshare */
 	std::list<RsLibraryInfo> libraries;
diff --git a/retroshare-gui/src/gui/HomePage.cpp b/retroshare-gui/src/gui/HomePage.cpp
index 9b8213646..ff7622b4b 100644
--- a/retroshare-gui/src/gui/HomePage.cpp
+++ b/retroshare-gui/src/gui/HomePage.cpp
@@ -27,13 +27,11 @@
 #include "util/misc.h"
 
 #include "gui/notifyqt.h"
-#include "gui/common/FilesDefs.h"
 #include "gui/msgs/MessageComposer.h"
 #include "gui/connect/ConnectFriendWizard.h"
 #include "gui/connect/ConfCertDialog.h"
 #include <gui/QuickStartWizard.h>
 #include "gui/connect/FriendRecommendDialog.h"
-#include "settings/rsharesettings.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 #include <QUrlQuery>
@@ -65,9 +63,6 @@ HomePage::HomePage(QWidget *parent) :
     QAction *RecAction = new QAction(QIcon(),tr("Recommend friends to each others"), this);
     connect(RecAction, SIGNAL(triggered()), this, SLOT(recommendFriends()));
 
-    QAction *SaveAction = new QAction(QIcon(),tr("Save to File"), this);
-    connect(SaveAction, SIGNAL(triggered()), this, SLOT(saveCert()));
-
     QAction *SendAction = new QAction(QIcon(),tr("Send via Email"), this);
     connect(SendAction, SIGNAL(triggered()), this, SLOT(runEmailClient()));
 
@@ -78,7 +73,6 @@ HomePage::HomePage(QWidget *parent) :
     menu->addAction(CopyIdAction);
 
     menu->addSeparator();
-    menu->addAction(SaveAction);
     menu->addAction(SendAction);
     menu->addAction(WebMailAction);
     menu->addAction(RecAction);
@@ -141,8 +135,6 @@ HomePage::HomePage(QWidget *parent) :
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { handleEvent(event); }, mEventHandlerId, RsEventType::NETWORK );
 
     updateOwnCert();
-
-    updateHomeLogo();
 }
 
 void HomePage::handleEvent(std::shared_ptr<const RsEvent> e)
@@ -385,18 +377,3 @@ void HomePage::openWebHelp()
 {
     QDesktopServices::openUrl(QUrl(QString("https://retrosharedocs.readthedocs.io/en/latest/")));
 }
-
-void HomePage::showEvent(QShowEvent *event)
-{
-	if (!event->spontaneous()) {
-		updateHomeLogo();
-	}
-}
-
-void HomePage::updateHomeLogo()
-{
-	if (Settings->getSheetName() == ":Standard_Dark")
-		ui->label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":images/logo/logo_web_nobackground_black.png"));
-	else
-		ui->label->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":images/logo/logo_web_nobackground.png"));
-}
diff --git a/retroshare-gui/src/gui/HomePage.h b/retroshare-gui/src/gui/HomePage.h
index 2dfc62f82..aa77ed1a3 100644
--- a/retroshare-gui/src/gui/HomePage.h
+++ b/retroshare-gui/src/gui/HomePage.h
@@ -51,8 +51,6 @@ public:
     void getOwnCert(QString& invite,QString& description) const;
     RetroshareInviteFlags currentInviteFlags() const ;
 
-    virtual void showEvent(QShowEvent *) override;
-
 private slots:
 #ifdef DEAD_CODE
     void certContextMenu(QPoint);
@@ -65,8 +63,7 @@ private slots:
 	void addFriend();
 	void webMail();
 	void openWebHelp() ;
-	void recommendFriends();
-	void updateHomeLogo();
+    void recommendFriends();
 
 private:
 	Ui::HomePage *ui;
diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui
index e716577b8..5de0fa6fe 100644
--- a/retroshare-gui/src/gui/HomePage.ui
+++ b/retroshare-gui/src/gui/HomePage.ui
@@ -43,6 +43,7 @@
         <property name="font">
          <font>
           <family>Courier New</family>
+          <pointsize>10</pointsize>
           <weight>75</weight>
           <bold>true</bold>
          </font>
@@ -87,6 +88,7 @@
         </property>
         <property name="font">
          <font>
+          <pointsize>11</pointsize>
           <weight>75</weight>
           <bold>true</bold>
          </font>
@@ -105,7 +107,7 @@
          <string>...</string>
         </property>
         <property name="icon">
-         <iconset resource="icons.qrc">
+         <iconset resource="images.qrc">
           <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
         </property>
         <property name="checkable">
@@ -231,6 +233,11 @@
    </item>
    <item row="1" column="0" colspan="5">
     <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+      </font>
+     </property>
      <property name="text">
       <string>Open Source cross-platform, 
 private and secure decentralized communication platform.
@@ -310,6 +317,11 @@ private and secure decentralized communication platform.
       </item>
       <item row="0" column="0" colspan="3">
        <widget class="QLabel" name="label_3">
+        <property name="font">
+         <font>
+          <pointsize>11</pointsize>
+         </font>
+        </property>
         <property name="styleSheet">
          <string notr="true"/>
         </property>
@@ -393,6 +405,11 @@ private and secure decentralized communication platform.
       </item>
       <item row="0" column="0" colspan="3">
        <widget class="QLabel" name="label_4">
+        <property name="font">
+         <font>
+          <pointsize>11</pointsize>
+         </font>
+        </property>
         <property name="text">
          <string>Do you need help with Retroshare?</string>
         </property>
@@ -407,8 +424,8 @@ private and secure decentralized communication platform.
   </layout>
  </widget>
  <resources>
-  <include location="icons.qrc"/>
   <include location="images.qrc"/>
+  <include location="icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index a2d588d3e..5397f6300 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -31,8 +31,6 @@
 #include "IdDialog.h"
 #include "ui_IdDialog.h"
 #include "IdEditDialog.h"
-#include "IdentityListModel.h"
-
 #include "gui/RetroShareLink.h"
 #include "gui/chat/ChatDialog.h"
 #include "gui/Circles/CreateCircleDialog.h"
@@ -52,7 +50,7 @@
 #include "util/rsdebug.h"
 
 #include "retroshare/rsgxsflags.h"
-#include "retroshare/rsmsgs.h"
+#include "retroshare/rsmsgs.h" 
 #include "retroshare/rspeers.h"
 #include "retroshare/rsservicecontrol.h"
 
@@ -94,6 +92,11 @@
 /****************************************************************
  */
 
+#define RSID_COL_NICKNAME   0
+#define RSID_COL_KEYID      1
+#define RSID_COL_IDTYPE     2
+#define RSID_COL_VOTES      3
+
 #define RSIDREP_COL_NAME       0
 #define RSIDREP_COL_OPINION    1
 #define RSIDREP_COL_COMMENT    2
@@ -120,7 +123,6 @@
 
 static const uint32_t SortRole = Qt::UserRole+1 ;
 
-#ifdef TO_REMOVE
 // quick solution for RSID_COL_VOTES sorting
 class TreeWidgetItem : public QTreeWidgetItem
 {
@@ -144,60 +146,6 @@ class TreeWidgetItem : public QTreeWidgetItem
         return data(column,Qt::DisplayRole).toString().toUpper() < other.data(column,Qt::DisplayRole).toString().toUpper();
   }
 };
-#endif
-
-std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere
-
-class IdListSortFilterProxyModel: public QSortFilterProxyModel
-{
-public:
-    explicit IdListSortFilterProxyModel(const QHeaderView *header,QObject *parent = NULL)
-        : QSortFilterProxyModel(parent)
-        , m_header(header)
-        , m_sortingEnabled(false), m_sortByState(false)
-    {
-        setDynamicSortFilter(false);  // causes crashes when true.
-    }
-
-    bool lessThan(const QModelIndex& left, const QModelIndex& right) const override
-    {
-//		bool online1 = (left .data(RsFriendListModel::OnlineRole).toInt() != RS_STATUS_OFFLINE);
-//		bool online2 = (right.data(RsFriendListModel::OnlineRole).toInt() != RS_STATUS_OFFLINE);
-//
-//        if((online1 != online2) && m_sortByState)
-//			return (m_header->sortIndicatorOrder()==Qt::AscendingOrder)?online1:online2 ;    // always put online nodes first
-
-#ifdef DEBUG_NEW_FRIEND_LIST
-        std::cerr << "Comparing index " << left << " with index " << right << std::endl;
-#endif
-        return QSortFilterProxyModel::lessThan(left,right);
-    }
-
-    bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override
-    {
-        // do not show empty groups
-
-        QModelIndex index = sourceModel()->index(source_row,0,source_parent);
-
-        return index.data(RsIdentityListModel::FilterRole).toString() == RsIdentityListModel::FilterString ;
-    }
-
-    void sort( int column, Qt::SortOrder order = Qt::AscendingOrder ) override
-    {
-        if(m_sortingEnabled)
-            return QSortFilterProxyModel::sort(column,order) ;
-    }
-
-    void setSortingEnabled(bool b) { m_sortingEnabled = b ; }
-    void setSortByState(bool b) { m_sortByState = b ; }
-    bool sortByState() const { return m_sortByState ; }
-
-private:
-    const QHeaderView *m_header ;
-    bool m_sortingEnabled;
-    bool m_sortByState;
-};
-
 
 /** Constructor */
 IdDialog::IdDialog(QWidget *parent)
@@ -205,8 +153,6 @@ IdDialog::IdDialog(QWidget *parent)
     , mExternalBelongingCircleItem(NULL)
     , mExternalOtherCircleItem(NULL )
     , mMyCircleItem(NULL)
-    , mLastSortColumn(RsIdentityListModel::COLUMN_THREAD_NAME)
-    , mLastSortOrder(Qt::SortOrder::AscendingOrder)
     , needUpdateIdsOnNextShow(true), needUpdateCirclesOnNextShow(true) // Update Ids and Circles on first show
     , ui(new Ui::IdDialog)
 {
@@ -221,29 +167,38 @@ IdDialog::IdDialog(QWidget *parent)
 	// This is used to grab the broadcast of changes from p3GxsCircles, which is discarded by the current dialog, since it expects data for p3Identity only.
 	//mCirclesBroadcastBase = new RsGxsUpdateBroadcastBase(rsGxsCircles, this);
 	//connect(mCirclesBroadcastBase, SIGNAL(fillDisplay(bool)), this, SLOT(updateCirclesDisplay(bool)));
+    
+	ownItem = new QTreeWidgetItem();
+	ownItem->setText(RSID_COL_NICKNAME, tr("My own identities"));
+	ownItem->setFont(RSID_COL_NICKNAME, ui->idTreeWidget->font());
+	ownItem->setData(RSID_COL_VOTES, Qt::DecorationRole,0xff);	// this is in order to prevent displaying a reputaiton icon next to these items.
 
-    mIdListModel = new RsIdentityListModel(this);
+	allItem = new QTreeWidgetItem();
+	allItem->setText(RSID_COL_NICKNAME, tr("All"));
+	allItem->setFont(RSID_COL_NICKNAME, ui->idTreeWidget->font());
+	allItem->setData(RSID_COL_VOTES, Qt::DecorationRole,0xff);
 
-    mProxyModel = new IdListSortFilterProxyModel(ui->idTreeWidget->header(),this);
+	contactsItem = new QTreeWidgetItem();
+	contactsItem->setText(RSID_COL_NICKNAME, tr("My contacts"));
+	contactsItem->setFont(RSID_COL_NICKNAME, ui->idTreeWidget->font());
+	contactsItem->setData(RSID_COL_VOTES, Qt::DecorationRole,0xff);
 
-    mProxyModel->setSourceModel(mIdListModel);
-    mProxyModel->setSortRole(RsIdentityListModel::SortRole);
-    mProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
-    mProxyModel->setFilterRole(RsIdentityListModel::FilterRole);
-    mProxyModel->setFilterRegExp(QRegExp(RsIdentityListModel::FilterString));
 
-    ui->idTreeWidget->setModel(mProxyModel);
-    //ui->idTreeWidget->setSelectionModel(new QItemSelectionModel(mProxyModel));// useless in Qt5.
+	ui->idTreeWidget->insertTopLevelItem(0, ownItem);
+	ui->idTreeWidget->insertTopLevelItem(0, allItem);
+	ui->idTreeWidget->insertTopLevelItem(0, contactsItem );
 
 	ui->treeWidget_membership->clear();
 	ui->treeWidget_membership->setItemDelegateForColumn(CIRCLEGROUP_CIRCLE_COL_GROUPNAME,new GxsIdTreeItemDelegate());
 
+
 	/* Setup UI helper */
     mStateHelper = new UIStateHelper(this);
+//	mStateHelper->addWidget(IDDIALOG_IDLIST, ui->idTreeWidget);
+	mStateHelper->addLoadPlaceholder(IDDIALOG_IDLIST, ui->idTreeWidget, false);
+	mStateHelper->addClear(IDDIALOG_IDLIST, ui->idTreeWidget);
 
-    connect(ui->idTreeWidget,SIGNAL(expanded(const QModelIndex&)),this,SLOT(trace_expanded(const QModelIndex&)),Qt::DirectConnection);
-    connect(ui->idTreeWidget,SIGNAL(collapsed(const QModelIndex&)),this,SLOT(trace_collapsed(const QModelIndex&)),Qt::DirectConnection);
-
+	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_PublishTS);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_KeyId);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->lineEdit_Type);
@@ -259,7 +214,7 @@ IdDialog::IdDialog(QWidget *parent)
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->label_positive);
 	mStateHelper->addWidget(IDDIALOG_IDDETAILS, ui->label_negative);
 
-	//mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
+	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_PublishTS);
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_KeyId);
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->lineEdit_Type);
@@ -270,7 +225,7 @@ IdDialog::IdDialog(QWidget *parent)
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->overallOpinion_TF);
 	mStateHelper->addLoadPlaceholder(IDDIALOG_IDDETAILS, ui->usageStatistics_TB);
 
-	//mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
+	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_Nickname);
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_PublishTS);
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_KeyId);
 	mStateHelper->addClear(IDDIALOG_IDDETAILS, ui->lineEdit_Type);
@@ -293,20 +248,17 @@ IdDialog::IdDialog(QWidget *parent)
 	connect(ui->editIdentity, SIGNAL(triggered()), this, SLOT(editIdentity()));
 	connect(ui->chatIdentity, SIGNAL(triggered()), this, SLOT(chatIdentity()));
 
-    connect(ui->idTreeWidget->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)),this,SLOT(updateSelection(const QItemSelection&,const QItemSelection&)));
-    connect(ui->idTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(IdListCustomPopupMenu(QPoint)));
-
-    ui->idTreeWidget->header()->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(ui->idTreeWidget->header(), SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(headerContextMenuRequested(QPoint)));
+	connect(ui->idTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(updateSelection()));
+	connect(ui->idTreeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(IdListCustomPopupMenu(QPoint)));
 
 	connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString)));
-    connect(ui->ownOpinion_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(modifyReputation()));
-
+	connect(ui->ownOpinion_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(modifyReputation()));
+	
 	connect(ui->inviteButton, SIGNAL(clicked()), this, SLOT(sendInvite()));
 	connect(ui->editButton, SIGNAL(clicked()), this, SLOT(editIdentity()));
 
-    connect(ui->idTreeWidget, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(chatIdentityItem(QModelIndex&)) );
-    connect(ui->idTreeWidget->header(),SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(sortColumn(int,Qt::SortOrder)));
+	connect( ui->idTreeWidget, &RSTreeWidget::itemDoubleClicked,
+	         this, &IdDialog::chatIdentityItem );
 
 	ui->editButton->hide();
 
@@ -317,13 +269,12 @@ IdDialog::IdDialog(QWidget *parent)
 	/* Initialize splitter */
 	ui->mainSplitter->setStretchFactor(0, 0);
 	ui->mainSplitter->setStretchFactor(1, 1);
-
+	
 	clearPerson();
 
-#ifdef TODO
 	/* Add filter types */
-    QMenu *idTWHMenu = new QMenu(tr("Show Items"), this);
-    ui->idTreeWidget->addContextMenuMenu(idTWHMenu);
+	QMenu *idTWHMenu = new QMenu(tr("Show Items"), this);
+	ui->idTreeWidget->addContextMenuMenu(idTWHMenu);
 
 	QActionGroup *idTWHActionGroup = new QActionGroup(this);
 	QAction *idTWHAction = new QAction(QIcon(),tr("All"), this);
@@ -376,51 +327,66 @@ IdDialog::IdDialog(QWidget *parent)
 	idTWHAction->setData(RSID_FILTER_BANNED);
 	connect(idTWHAction, SIGNAL(toggled(bool)), this, SLOT(filterToggled(bool)));
 	idTWHMenu->addAction(idTWHAction);
-#endif
-
+	
     QAction *CreateIDAction = new QAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/person.png"),tr("Create new Identity"), this);
 	connect(CreateIDAction, SIGNAL(triggered()), this, SLOT(addIdentity()));
-
+	
     QAction *CreateCircleAction = new QAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/circles.png"),tr("Create new circle"), this);
 	connect(CreateCircleAction, SIGNAL(triggered()), this, SLOT(createExternalCircle()));
-
+	
 	QMenu *menu = new QMenu();
 	menu->addAction(CreateIDAction);
 	menu->addAction(CreateCircleAction);
 	ui->toolButton_New->setMenu(menu);
+	
+	/* Add filter actions */
+	QTreeWidgetItem *headerItem = ui->idTreeWidget->headerItem();
+	QString headerText = headerItem->text(RSID_COL_NICKNAME);
+	ui->filterLineEdit->addFilter(QIcon(), headerText, RSID_COL_NICKNAME, QString("%1 %2").arg(tr("Search"), headerText));
 
-    QFontMetricsF fm(ui->idTreeWidget->font()) ;
+    headerItem->setData(RSID_COL_VOTES,Qt::UserRole,tr("Reputation"));
 
 	/* Set initial section sizes */
-    QHeaderView * circlesheader = ui->treeWidget_membership->header () ;
-    circlesheader->resizeSection (CIRCLEGROUP_CIRCLE_COL_GROUPNAME, fm.width("Circle name")*1.5) ;
-    ui->treeWidget_membership->setColumnWidth(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, 270);
+  QHeaderView * circlesheader = ui->treeWidget_membership->header () ;
+  circlesheader->resizeSection (CIRCLEGROUP_CIRCLE_COL_GROUPNAME, QFontMetricsF(ui->idTreeWidget->font()).width("Circle name")*1.5) ;
+  ui->treeWidget_membership->setColumnWidth(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, 270);
+
+	ui->filterLineEdit->addFilter(QIcon(), tr("ID"), RSID_COL_KEYID, tr("Search ID"));
 
 	/* Setup tree */
-    //ui->idTreeWidget->sortByColumn(RsIdentityListModel::COLUMN_THREAD_NAME, Qt::AscendingOrder);
+	ui->idTreeWidget->sortByColumn(RSID_COL_NICKNAME, Qt::AscendingOrder);
 
-    ui->idTreeWidget->setColumnHidden(RsIdentityListModel::COLUMN_THREAD_OWNER_ID, true);
-    ui->idTreeWidget->setColumnHidden(RsIdentityListModel::COLUMN_THREAD_OWNER_NAME, true);
-    ui->idTreeWidget->setColumnHidden(RsIdentityListModel::COLUMN_THREAD_ID, true);
+	ui->idTreeWidget->enableColumnCustomize(true);
+	ui->idTreeWidget->setColumnCustomizable(RSID_COL_NICKNAME, false);
 
+	ui->idTreeWidget->setColumnHidden(RSID_COL_IDTYPE, true);
+	ui->idTreeWidget->setColumnHidden(RSID_COL_KEYID, true);
+	
+	/* Set initial column width */
+	int fontWidth = QFontMetricsF(ui->idTreeWidget->font()).width("W");
+	ui->idTreeWidget->setColumnWidth(RSID_COL_NICKNAME, 14 * fontWidth);
+	ui->idTreeWidget->setColumnWidth(RSID_COL_KEYID, 20 * fontWidth);
+	ui->idTreeWidget->setColumnWidth(RSID_COL_IDTYPE, 18 * fontWidth);
+	ui->idTreeWidget->setColumnWidth(RSID_COL_VOTES, 2 * fontWidth);
+	
 	ui->idTreeWidget->setItemDelegate(new RSElidedItemDelegate());
-    ui->idTreeWidget->setItemDelegateForColumn( RsIdentityListModel::COLUMN_THREAD_REPUTATION, new ReputationItemDelegate(RsReputationLevel(0xff)));
+	ui->idTreeWidget->setItemDelegateForColumn(
+	            RSID_COL_NICKNAME,
+	            new GxsIdTreeItemDelegate());
+	ui->idTreeWidget->setItemDelegateForColumn(
+	            RSID_COL_VOTES,
+	            new ReputationItemDelegate(RsReputationLevel(0xff)));
 
 	/* Set header resize modes and initial section sizes */
 	QHeaderView * idheader = ui->idTreeWidget->header();
-    QHeaderView_setSectionResizeModeColumn(idheader, RsIdentityListModel::COLUMN_THREAD_NAME, QHeaderView::Stretch);
-    QHeaderView_setSectionResizeModeColumn(idheader, RsIdentityListModel::COLUMN_THREAD_ID, QHeaderView::Stretch);
-    QHeaderView_setSectionResizeModeColumn(idheader, RsIdentityListModel::COLUMN_THREAD_OWNER_ID, QHeaderView::Stretch);
-    QHeaderView_setSectionResizeModeColumn(idheader, RsIdentityListModel::COLUMN_THREAD_OWNER_NAME, QHeaderView::Stretch);
-    QHeaderView_setSectionResizeModeColumn(idheader, RsIdentityListModel::COLUMN_THREAD_REPUTATION, QHeaderView::Fixed);
-    ui->idTreeWidget->setColumnWidth(RsIdentityListModel::COLUMN_THREAD_REPUTATION,fm.height());
-    idheader->setStretchLastSection(false);
+	QHeaderView_setSectionResizeModeColumn(idheader, RSID_COL_VOTES, QHeaderView::ResizeToContents);
+	idheader->setStretchLastSection(true);
 
-    mStateHelper->setActive(IDDIALOG_IDDETAILS, false);
+	mStateHelper->setActive(IDDIALOG_IDDETAILS, false);
     mStateHelper->setActive(IDDIALOG_REPLIST, false);
 
 	int H = misc::getFontSizeFactor("HelpButton").height();
-    QString hlp_str = tr(
+	QString hlp_str = tr(
 	    "<h1><img width=\"%1\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Identities</h1>"
 	    "<p>In this tab you can create/edit <b>pseudo-anonymous identities</b>, and <b>circles</b>.</p>"
 	    "<p><b>Identities</b> are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,"
@@ -442,42 +408,13 @@ IdDialog::IdDialog(QWidget *parent)
 	processSettings(true);
 
     // circles stuff
-
+    
     //connect(ui->treeWidget_membership, SIGNAL(itemSelectionChanged()), this, SLOT(circle_selected()));
     connect(ui->treeWidget_membership, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(CircleListCustomPopupMenu(QPoint)));
     connect(ui->autoBanIdentities_CB, SIGNAL(toggled(bool)), this, SLOT(toggleAutoBanIdentities(bool)));
 
-    updateIdTimer.setSingleShot(true);
+	updateIdTimer.setSingleShot(true);
 	connect(&updateIdTimer, SIGNAL(timeout()), this, SLOT(updateIdList()));
-
-    mFontSizeHandler.registerFontSize(ui->idTreeWidget, 0, [this] (QAbstractItemView*, int fontSize) {
-        // Set new font size on all items
-
-        mIdListModel->setFontSize(fontSize);
-    });
-
-    mFontSizeHandler.registerFontSize(ui->treeWidget_membership, 0, [this] (QAbstractItemView*, int fontSize) {
-		// Set new font size on all items
-		QTreeWidgetItemIterator it(ui->treeWidget_membership);
-		while (*it) {
-			QTreeWidgetItem *item = *it;
-#ifdef CIRCLE_MEMBERSHIP_CATEGORIES
-			if (item->parent())
-			{
-#endif
-				QFont font = item->font(CIRCLEGROUP_CIRCLE_COL_GROUPNAME);
-				font.setPointSize(fontSize);
-
-				item->setFont(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, font);
-				item->setFont(CIRCLEGROUP_CIRCLE_COL_GROUPID, font);
-				item->setFont(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, font);
-
-#ifdef CIRCLE_MEMBERSHIP_CATEGORIES
-			}
-#endif
-			++it;
-		}
-	});
 }
 
 void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
@@ -492,19 +429,17 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
 		switch(e->mIdentityEventCode)
 		{
 		case RsGxsIdentityEventCode::DELETED_IDENTITY:
-            if(mId == e->mIdentityId)
-            {
-                mId.clear();
-                updateIdentity();
-            }
-            updateIdListRequest();
-            break;
-
-        case RsGxsIdentityEventCode::NEW_IDENTITY:
+		case RsGxsIdentityEventCode::NEW_IDENTITY:
 		case RsGxsIdentityEventCode::UPDATED_IDENTITY:
 			if (isVisible())
-                updateIdListRequest(); 	// use a timer for events not generated by local changes which generally
-                                        // come in large herds. Allows to group multiple changes into a single UI update.
+			{
+                if(rsIdentity->isOwnId(RsGxsId(e->mIdentityId)))
+                    updateIdList();
+                else
+                    updateIdTimer.start(3000);		// use a timer for events not generated by local changes
+			}
+			else
+				needUpdateIdsOnNextShow = true;
 
 			if(!mId.isNull() && mId == e->mIdentityId)
 				updateIdentity();
@@ -544,13 +479,13 @@ void IdDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
 
 void IdDialog::clearPerson()
 {
-	//QFontMetricsF f(ui->avLabel_Person->font()) ;
+	QFontMetricsF f(ui->avLabel_Person->font()) ;
 
+	ui->avLabel_Person->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/people.png").scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
 	ui->headerTextLabel_Person->setText(tr("People"));
 
 	ui->info_Frame_Invite->hide();
 	ui->avatarLabel->clear();
-	ui->avatarLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/people.png"));
 
 	whileBlocking(ui->ownOpinion_CB)->setCurrentIndex(1);
 	whileBlocking(ui->autoBanIdentities_CB)->setChecked(false);
@@ -564,7 +499,7 @@ void IdDialog::toggleAutoBanIdentities(bool b)
     if(!id.isNull())
     {
         rsReputations->banNode(id,b) ;
-        updateIdListRequest();
+        updateIdList();
     }
 }
 
@@ -572,10 +507,10 @@ void IdDialog::updateCirclesDisplay()
 {
     if(RsAutoUpdatePage::eventsLocked())
         return ;
-
+    
     if(!isVisible())
         return ;
-
+    
 #ifdef ID_DEBUG
     std::cerr << "!!Updating circles display!" << std::endl;
 #endif
@@ -720,6 +655,7 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
 	{
 		mExternalOtherCircleItem = new QTreeWidgetItem();
 		mExternalOtherCircleItem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, tr("Other circles"));
+		mExternalOtherCircleItem->setFont(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, ui->treeWidget_membership->font());
 		ui->treeWidget_membership->addTopLevelItem(mExternalOtherCircleItem);
 	}
 
@@ -727,6 +663,7 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
 	{
 		mExternalBelongingCircleItem = new QTreeWidgetItem();
 		mExternalBelongingCircleItem->setText(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, tr("Circles I belong to"));
+		mExternalBelongingCircleItem->setFont(CIRCLEGROUP_CIRCLE_COL_GROUPNAME, ui->treeWidget_membership->font());
 		ui->treeWidget_membership->addTopLevelItem(mExternalBelongingCircleItem);
 	}
 #endif
@@ -983,16 +920,16 @@ void IdDialog::loadCircles(const std::list<RsGroupMetaData>& groupInfo)
 
 bool IdDialog::getItemCircleId(QTreeWidgetItem *item,RsGxsCircleId& id)
 {
-#ifdef CIRCLE_MEMBERSHIP_CATEGORIES
+#ifdef CIRCLE_MEMBERSHIP_CATEGORIES    
     if ((!item) || (!item->parent()))
 	    return false;
-
+    
 	QString coltext = (item->parent()->parent())? (item->parent()->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString()) : (item->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString());
     id = RsGxsCircleId( coltext.toStdString()) ;
 #else
     if(!item)
 	    return false;
-
+    
     QString coltext = (item->parent())? (item->parent()->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString()) : (item->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString());
     id = RsGxsCircleId( coltext.toStdString()) ;
 #endif
@@ -1002,7 +939,7 @@ bool IdDialog::getItemCircleId(QTreeWidgetItem *item,RsGxsCircleId& id)
 void IdDialog::showEvent(QShowEvent *s)
 {
 	if (needUpdateIdsOnNextShow)
-        updateIdListRequest();
+		updateIdList();
 	if (needUpdateCirclesOnNextShow)
 		updateCircles();
 
@@ -1021,19 +958,19 @@ void IdDialog::createExternalCircle()
 void IdDialog::showEditExistingCircle()
 {
     RsGxsCircleId id ;
-
+    
     if(!getItemCircleId(ui->treeWidget_membership->currentItem(),id))
        return ;
-
+    
     uint32_t subscribe_flags = ui->treeWidget_membership->currentItem()->data(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole).toUInt();
-
+	
     CreateCircleDialog dlg;
-
+    
     dlg.editExistingId(RsGxsGroupId(id),true,!(subscribe_flags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN)) ;
     dlg.exec();
 }
 
-void IdDialog::grantCircleMembership()
+void IdDialog::grantCircleMembership() 
 {
 	RsGxsCircleId circle_id ;
 
@@ -1050,7 +987,7 @@ void IdDialog::grantCircleMembership()
     });
 }
 
-void IdDialog::revokeCircleMembership()
+void IdDialog::revokeCircleMembership() 
 {
 	RsGxsCircleId circle_id ;
 
@@ -1079,22 +1016,22 @@ void IdDialog::revokeCircleMembership()
 		});
 }
 
-void IdDialog::acceptCircleSubscription()
+void IdDialog::acceptCircleSubscription() 
 {
     RsGxsCircleId circle_id ;
-
+    
     if(!getItemCircleId(ui->treeWidget_membership->currentItem(),circle_id))
         return;
 
     RsGxsId own_id(qobject_cast<QAction*>(sender())->data().toString().toStdString());
-
+    
     rsGxsCircles->requestCircleMembership(own_id,circle_id) ;
 }
 
-void IdDialog::cancelCircleSubscription()
-{
+void IdDialog::cancelCircleSubscription() 
+{	
     RsGxsCircleId circle_id ;
-
+    
     if(!getItemCircleId(ui->treeWidget_membership->currentItem(),circle_id))
         return;
 
@@ -1102,14 +1039,14 @@ void IdDialog::cancelCircleSubscription()
 
     rsGxsCircles->cancelCircleMembership(own_id,circle_id) ;
 }
-
+    
 void IdDialog::CircleListCustomPopupMenu( QPoint )
 {
     QMenu contextMnu( this );
 
     RsGxsCircleId circle_id ;
     QTreeWidgetItem *item = ui->treeWidget_membership->currentItem();
-
+            
     if(!getItemCircleId(item,circle_id))
         return ;
 
@@ -1117,7 +1054,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
     RsGxsId item_id(item->data(CIRCLEGROUP_CIRCLE_COL_GROUPID,Qt::UserRole).toString().toStdString());
     bool is_circle ;
     bool am_I_circle_admin = false ;
-
+    
     if(item_id == RsGxsId(circle_id))	// is it a circle?
     {
 	    uint32_t group_flags = item->data(CIRCLEGROUP_CIRCLE_COL_GROUPFLAGS, Qt::UserRole).toUInt();
@@ -1136,7 +1073,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
 #ifdef CIRCLE_MEMBERSHIP_CATEGORIES
 	}
 #endif
-
+        
 #ifdef ID_DEBUG
 	    std::cerr << "  Item is a circle item. Adding Edit/Details menu entry." << std::endl;
 #endif
@@ -1144,7 +1081,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
 
 	    contextMnu.addSeparator() ;
     }
-    else
+    else 
     {
 	    current_gxs_id = RsGxsId(item_id);
 	    is_circle =false ;
@@ -1159,9 +1096,9 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
 	    std::cerr << "  Item is a GxsId item. Requesting flags/group id from parent: " << circle_id << std::endl;
 #endif
     }
-
+ 
     RsGxsCircleDetails details ;
-
+    
     if(!rsGxsCircles->getCircleDetails(circle_id,details))// grab real circle ID from parent. Make sure circle id is used correctly afterwards!
     {
         std::cerr << "  (EE) cannot get circle info for ID " << circle_id << ". Not in cache?" << std::endl;
@@ -1198,7 +1135,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
 				    ids[REMOVE].push_back(*it) ;
 			    else
 				    ids[CANCEL].push_back(*it) ;
-		    else
+		    else 
 			    if(subscribe_flags & GXS_EXTERNAL_CIRCLE_FLAGS_IN_ADMIN_LIST)
 				    ids[ACCEPT].push_back(*it) ;
 			    else
@@ -1259,17 +1196,17 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
 		    contextMnu.addMenu(menu) ;
 	    }
     }
-
+    
     if(!is_circle && am_I_circle_admin)	// I am circle admin. I can therefore revoke/accept membership
     {
 	std::map<RsGxsId,uint32_t>::const_iterator it = details.mSubscriptionFlags.find(current_gxs_id) ;
-
+    
         if(!current_gxs_id.isNull() && it != details.mSubscriptionFlags.end())
         {
 	    contextMnu.addSeparator() ;
 
 	    if(it->second & GXS_EXTERNAL_CIRCLE_FLAGS_IN_ADMIN_LIST)
-	    {
+	    { 
 		    QAction *action = new QAction(tr("Revoke this member"),this) ;
 		    action->setData(QString::fromStdString(current_gxs_id.toStdString()));
 		    QObject::connect(action,SIGNAL(triggered()), this, SLOT(revokeCircleMembership()));
@@ -1297,8 +1234,6 @@ IdDialog::~IdDialog()
 	// save settings
 	processSettings(false);
 
-    delete mIdListModel;
-    delete mProxyModel;
 	delete(ui);
 }
 
@@ -1316,65 +1251,46 @@ static QString getHumanReadableDuration(uint32_t seconds)
         return QString(QObject::tr("%1 hours ago")).arg(seconds/3600) ;
     else if(seconds < 2*24*3600)
         return QString(QObject::tr("%1 day ago")).arg(seconds/86400) ;
-    else
+    else 
         return QString(QObject::tr("%1 days ago")).arg(seconds/86400) ;
 }
 
 void IdDialog::processSettings(bool load)
 {
-    Settings->beginGroup("IdDialog");
+	Settings->beginGroup("IdDialog");
 
-    if (load) {
-        // load settings
+	// state of peer tree
+	ui->idTreeWidget->processSettings(load);
 
-        ui->idTreeWidget->header()->restoreState(Settings->value(objectName()).toByteArray());
-        ui->idTreeWidget->header()->setHidden(Settings->value(objectName()+"HiddenHeader", false).toBool());
+	if (load) {
+		// load settings
 
-        // filterColumn
-        //ui->filterLineEdit->setCurrentFilter(Settings->value("filterColumn", RsIdentityListModel::COLUMN_THREAD_NAME).toInt());
+		// filterColumn
+		ui->filterLineEdit->setCurrentFilter(Settings->value("filterColumn", RSID_COL_NICKNAME).toInt());
 
-        // state of splitter
-        ui->mainSplitter->restoreState(Settings->value("splitter").toByteArray());
+		// state of splitter
+		ui->mainSplitter->restoreState(Settings->value("splitter").toByteArray());
 
-        //Restore expanding
-        ui->idTreeWidget->setExpanded(mProxyModel->mapFromSource(mIdListModel->getIndexOfCategory(RsIdentityListModel::CATEGORY_ALL)),Settings->value("ExpandAll", QVariant(true)).toBool());
-        ui->idTreeWidget->setExpanded(mProxyModel->mapFromSource(mIdListModel->getIndexOfCategory(RsIdentityListModel::CATEGORY_OWN)),Settings->value("ExpandOwn", QVariant(true)).toBool());
-        ui->idTreeWidget->setExpanded(mProxyModel->mapFromSource(mIdListModel->getIndexOfCategory(RsIdentityListModel::CATEGORY_CTS)),Settings->value("ExpandContacts", QVariant(true)).toBool());
+		//Restore expanding
+		allItem->setExpanded(Settings->value("ExpandAll", QVariant(true)).toBool());
+		ownItem->setExpanded(Settings->value("ExpandOwn", QVariant(true)).toBool());
+		contactsItem->setExpanded(Settings->value("ExpandContacts", QVariant(true)).toBool());
+	} else {
+		// save settings
 
-        // visible columns
+		// filterColumn
+		Settings->setValue("filterColumn", ui->filterLineEdit->currentFilter());
 
-        int v = Settings->value("columnVisibility",(1 << RsIdentityListModel::COLUMN_THREAD_NAME)+(1 << RsIdentityListModel::COLUMN_THREAD_REPUTATION)).toInt();
+		// state of splitter
+		Settings->setValue("splitter", ui->mainSplitter->saveState());
+		
+		//save expanding
+		Settings->setValue("ExpandAll", allItem->isExpanded());
+		Settings->setValue("ExpandContacts", contactsItem->isExpanded());
+		Settings->setValue("ExpandOwn", ownItem->isExpanded());
+	}
 
-        for(int i=0;i<mIdListModel->columnCount();++i)
-            ui->idTreeWidget->setColumnHidden(i,!(v & (1<<i)));
-    }
-    else
-    {
-        // save settings
-
-        Settings->setValue(objectName(), ui->idTreeWidget->header()->saveState());
-        Settings->setValue(objectName()+"HiddenHeader", ui->idTreeWidget->header()->isHidden());
-
-        // filterColumn
-        //Settings->setValue("filterColumn", ui->filterLineEdit->currentFilter());
-
-        // state of splitter
-        Settings->setValue("splitter", ui->mainSplitter->saveState());
-
-        //save expanding
-        Settings->setValue("ExpandAll",        ui->idTreeWidget->isExpanded(mProxyModel->mapFromSource(mIdListModel->getIndexOfCategory(RsIdentityListModel::CATEGORY_ALL))));
-        Settings->setValue("ExpandContacts",   ui->idTreeWidget->isExpanded(mProxyModel->mapFromSource(mIdListModel->getIndexOfCategory(RsIdentityListModel::CATEGORY_CTS))));
-        Settings->setValue("ExpandOwn",        ui->idTreeWidget->isExpanded(mProxyModel->mapFromSource(mIdListModel->getIndexOfCategory(RsIdentityListModel::CATEGORY_OWN))));
-
-        int v = 0;
-        for(int i=0;i<mIdListModel->columnCount();++i)
-            if(!ui->idTreeWidget->isColumnHidden(i))
-                v += (1 << i);
-
-        Settings->setValue("columnVisibility",v);
-    }
-
-    Settings->endGroup();
+	Settings->endGroup();
 }
 
 void IdDialog::filterChanged(const QString& /*text*/)
@@ -1388,79 +1304,79 @@ void IdDialog::filterToggled(const bool &value)
 		QAction *source = qobject_cast<QAction *>(QObject::sender());
 		if (source) {
 			filter = source->data().toInt();
-            updateIdListRequest();
+			updateIdList();
 		}
 	}
 }
 
-void IdDialog::updateSelection(const QItemSelection& /* new_sel */,const QItemSelection& /* old_sel */)
+void IdDialog::updateSelection()
 {
-#ifdef DEBUG_ID_DIALOG
-    std::cerr << "Got selectionChanged signal. Old selection is: " << std::endl;
-    for(auto i:old_sel.indexes()) std::cerr << "    " << i << std::endl;
-    std::cerr << "Got selectionChanged signal. New selection is: " << std::endl;
-    for(auto i:new_sel.indexes()) std::cerr << "    " << i << std::endl;
-#endif
+	QTreeWidgetItem *item = ui->idTreeWidget->currentItem();
+	RsGxsGroupId id;
 
-    auto id = RsGxsGroupId(getSelectedIdentity());
+	if (item) {
+		id = RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString());
+	}
 
-#ifdef DEBUG_ID_DIALOG
-    std::cerr << "updating selection to id " << id << std::endl;
-#endif
-    if(id != mId)
-    {
+	if (id != mId) {
 		mId = id;
 		updateIdentity();
+		//updateRepList();
 	}
 }
 
-void IdDialog::updateIdListRequest()
-{
-    if(updateIdTimer.isActive())
-    {
-        std::cerr << "updateIdListRequest(): restarting timer"<< std::endl;
-        updateIdTimer.stop();
-        updateIdTimer.start(1000);
-    }
-    else
-    {
-        std::cerr << "updateIdListRequest(): starting timer"<< std::endl;
-        updateIdTimer.start(1000);
-    }
-}
+
 
 void IdDialog::updateIdList()
 {
-    //print_stacktrace();
+	//int accept = filter;
 
-    RsThread::async([this]()
-    {
-        std::list<RsGroupMetaData> *ids = new std::list<RsGroupMetaData>();
+ 	RsThread::async([this]()
+	{
+        // 1 - get message data from p3GxsForums
 
-        if(!rsIdentity->getIdentitiesSummaries(*ids))
-        {
-            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve identity metadata." << std::endl;
-            return;
-        }
+#ifdef DEBUG_FORUMS
+        std::cerr << "Retrieving post data for post " << mThreadId << std::endl;
+#endif
 
-        RsQThreadUtils::postToObject( [ids,this]()
-        {
+        std::list<RsGroupMetaData> identity_metas ;
 
-            std::cerr << "Updating identity list in widget." << std::endl;
+		if (!rsIdentity->getIdentitiesSummaries(identity_metas))
+		{
+			std::cerr << "IdDialog::insertIdList() Error getting GroupData" << std::endl;
+			return;
+		}
 
-            applyWhileKeepingTree( [ids,this]()
-            {
-                std::cerr << "setting new identity in model." << std::endl;
-                mIdListModel->setIdentities(*ids) ;
-                delete ids;
+        std::set<RsGxsId> ids;
+        for(auto it(identity_metas.begin());it!=identity_metas.end();++it)
+            ids.insert(RsGxsId((*it).mGroupId));
+
+        std::vector<RsGxsIdGroup> groups;
+
+        if(!rsIdentity->getIdentitiesInfo(ids,groups))
+		{
+			std::cerr << "IdDialog::insertIdList() Error getting identities info" << std::endl;
+			return;
+		}
+
+        auto ids_set = new std::map<RsGxsGroupId,RsGxsIdGroup>();
+
+		for(auto it(groups.begin()); it!=groups.end(); ++it)
+			(*ids_set)[(*it).mMeta.mGroupId] = *it;
+
+        RsQThreadUtils::postToObject( [ids_set, this] ()
+		{
+			/* Here it goes any code you want to be executed on the Qt Gui
+			 * thread, for example to update the data model with new information
+			 * after a blocking call to RetroShare API complete */
+			loadIdentities(*ids_set);
+            delete ids_set;
+
+		}, this );
 
-                ui->label_count->setText("("+QString::number(mIdListModel->count())+")");
-            });
-        });
     });
 }
 
-#ifdef TO_REMOVE
 bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept)
 {
 	bool isLinkedToOwnNode = (data.mPgpKnown && (data.mPgpId == ownPgpId)) ;
@@ -1560,13 +1476,13 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
 			rsPeers->getGPGDetails(data.mPgpId, details);
 			item->setText(RSID_COL_IDTYPE, QString::fromUtf8(details.name.c_str()));
 			item->setToolTip(RSID_COL_IDTYPE,"Verified signature from node "+QString::fromStdString(data.mPgpId.toStdString())) ;
-
-
+			
+			
 			QString tooltip = tr("Node name:")+" " + QString::fromUtf8(details.name.c_str()) + "\n";
 			tooltip        += tr("Node Id  :")+" " + QString::fromStdString(data.mPgpId.toStdString()) ;
 			item->setToolTip(RSID_COL_KEYID,tooltip) ;
 		}
-		else
+		else 
 		{
 			QString txt =  tr("[Unknown node]");
 			item->setText(RSID_COL_IDTYPE, txt);
@@ -1592,7 +1508,112 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
 	return true;
 }
 
-#endif
+void IdDialog::loadIdentities(const std::map<RsGxsGroupId,RsGxsIdGroup>& ids_set_const)
+{
+	auto ids_set(ids_set_const);
+
+	//First: Get current item to restore after
+	RsGxsGroupId oldCurrentId = mIdToNavigate;
+	{
+		QTreeWidgetItem *oldCurrent = ui->idTreeWidget->currentItem();
+		if (oldCurrent) {
+			oldCurrentId = RsGxsGroupId(oldCurrent->text(RSID_COL_KEYID).toStdString());
+		}
+	}
+
+	//Save expanding
+	Settings->beginGroup("IdDialog");
+	Settings->setValue("ExpandAll", allItem->isExpanded());
+	Settings->setValue("ExpandContacts", contactsItem->isExpanded());
+	Settings->setValue("ExpandOwn", ownItem->isExpanded());
+	Settings->endGroup();
+
+
+	int accept = filter;
+
+	mStateHelper->setActive(IDDIALOG_IDLIST, true);
+
+	RsPgpId ownPgpId  = rsPeers->getGPGOwnId();
+
+	// Update existing and remove not existing items 
+	// Also remove items that do not have the correct parent
+
+	QTreeWidgetItemIterator itemIterator(ui->idTreeWidget);
+	QTreeWidgetItem *item = NULL;
+
+	while ((item = *itemIterator) != NULL) 
+	{
+		++itemIterator;
+		auto it = ids_set.find(RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString())) ;
+
+		if(it == ids_set.end())
+		{
+			if(item != allItem && item != contactsItem && item != ownItem)
+				delete(item);
+
+			continue ;
+		}
+
+		QTreeWidgetItem *parent_item = item->parent() ;
+
+//        if(it->second.mMeta.mPublishTs > time(NULL) - 20 || it->second.mMeta.mGroupId == RsGxsGroupId("3de2172503675206b3a23c997e5ee688"))
+//            std::cerr << "Captured ID " <<it->second.mMeta.mGroupId << std::endl;
+
+		if(    (parent_item == allItem && it->second.mIsAContact) || (parent_item == contactsItem && !it->second.mIsAContact))
+		{
+			delete item ;	// do not remove from the list, so that it is added again in the correct place.
+			continue ;
+		}
+
+		if (!fillIdListItem(it->second, item, ownPgpId, accept))
+			delete(item);
+
+		ids_set.erase(it);	// erase, so it is not considered to be a new item
+	}
+
+	/* Insert new items */
+	for (std::map<RsGxsGroupId,RsGxsIdGroup>::const_iterator vit = ids_set.begin(); vit != ids_set.end(); ++vit)
+	{
+		RsGxsIdGroup data = vit->second ;
+
+		item = NULL;
+
+		if (fillIdListItem(data, item, ownPgpId, accept))
+		{
+			if(data.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN)
+				ownItem->addChild(item);
+			else if(data.mIsAContact)
+				contactsItem->addChild(item);
+			else
+				allItem->addChild(item);
+
+		}
+	}
+	
+	/* count items */
+	int itemCount = contactsItem->childCount() + allItem->childCount() + ownItem->childCount();
+	ui->label_count->setText( "(" + QString::number( itemCount ) + ")" );
+	
+	int contactsCount = contactsItem->childCount() ;
+	int allCount = allItem->childCount() ;
+	int ownCount = ownItem->childCount();
+
+	contactsItem->setText(0, tr("My contacts") + " (" + QString::number( contactsCount ) + ")" );
+	allItem->setText(0, tr("All") + " (" + QString::number( allCount ) + ")" );
+	ownItem->setText(0, tr("My own identities") + " (" +  QString::number( ownCount ) + ")" );
+
+
+	//Restore expanding
+	Settings->beginGroup("IdDialog");
+	allItem->setExpanded(Settings->value("ExpandAll", QVariant(true)).toBool());
+	ownItem->setExpanded(Settings->value("ExpandOwn", QVariant(true)).toBool());
+	contactsItem->setExpanded(Settings->value("ExpandContacts", QVariant(true)).toBool());
+	Settings->endGroup();
+
+	navigate(RsGxsId(oldCurrentId));
+	filterIds();
+	updateSelection();
+}
 
 void IdDialog::updateIdentity()
 {
@@ -1638,7 +1659,7 @@ void IdDialog::updateIdentity()
 
             loadIdentity(group);
 
-        }, this );
+		}, this );
 	});
 }
 
@@ -1654,7 +1675,7 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
 	RsPgpId ownPgpId  = rsPeers->getGPGOwnId();
 
     ui->lineEdit_PublishTS->setText(QDateTime::fromMSecsSinceEpoch(qint64(1000)*data.mMeta.mPublishTs).toString(Qt::SystemLocaleShortDate));
-    //ui->lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE));
+    ui->lineEdit_Nickname->setText(QString::fromUtf8(data.mMeta.mGroupName.c_str()).left(RSID_MAXIMUM_NICKNAME_SIZE));
 	ui->lineEdit_KeyId->setText(QString::fromStdString(data.mMeta.mGroupId.toStdString()));
 	//ui->lineEdit_GpgHash->setText(QString::fromStdString(data.mPgpIdHash.toStdString()));
     if(data.mPgpKnown)
@@ -1680,8 +1701,8 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
 
 	//ui->avLabel_Person->setPixmap(pixmap);
 	//ui->avatarLabel->setPixmap(pixmap);
-	//QFontMetricsF f(ui->avLabel_Person->font()) ;
-	//ui->avLabel_Person->setPixmap(pixmap.scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+	QFontMetricsF f(ui->avLabel_Person->font()) ;
+	ui->avLabel_Person->setPixmap(pixmap.scaled(f.height()*4,f.height()*4,Qt::KeepAspectRatio,Qt::SmoothTransformation));
 
 	ui->avatarLabel->setPixmap(pixmap.scaled(ui->inviteButton->width(),ui->inviteButton->width(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
 	ui->avatarLabel->setScaledContents(true);
@@ -1710,7 +1731,7 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
 		ui->lineEdit_GpgId->show() ;
 		ui->label_GpgId->show() ;
 	}
-
+    
     if(data.mPgpKnown)
     {
 		ui->lineEdit_GpgName->show() ;
@@ -1750,6 +1771,7 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
 
 	if (isOwnId)
 	{
+        mStateHelper->setWidgetEnabled(ui->ownOpinion_CB, false);
         mStateHelper->setWidgetEnabled(ui->autoBanIdentities_CB, false);
         // ui->editIdentity->setEnabled(true);
         // ui->removeIdentity->setEnabled(true);
@@ -1759,6 +1781,8 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
 	}
 	else
 	{
+		// No Reputation yet!
+        mStateHelper->setWidgetEnabled(ui->ownOpinion_CB, true);
         mStateHelper->setWidgetEnabled(ui->autoBanIdentities_CB, true);
         // ui->editIdentity->setEnabled(false);
         // ui->removeIdentity->setEnabled(false);
@@ -1802,7 +1826,7 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
         frep_string = tr("No votes from friends") ;
 
     ui->neighborNodesOpinion_TF->setText(frep_string) ;
-
+    
     ui->label_positive->setText(QString::number(info.mFriendsPositiveVotes));
     ui->label_negative->setText(QString::number(info.mFriendsNegativeVotes));
 
@@ -1825,9 +1849,9 @@ void IdDialog::loadIdentity(RsGxsIdGroup data)
 
 	switch(info.mOwnOpinion)
 	{
-    case RsOpinion::NEGATIVE: whileBlocking(ui->ownOpinion_CB)->setCurrentIndex(0); break;
-    case RsOpinion::NEUTRAL : whileBlocking(ui->ownOpinion_CB)->setCurrentIndex(1); break;
-    case RsOpinion::POSITIVE: whileBlocking(ui->ownOpinion_CB)->setCurrentIndex(2); break;
+	case RsOpinion::NEGATIVE: ui->ownOpinion_CB->setCurrentIndex(0); break;
+	case RsOpinion::NEUTRAL : ui->ownOpinion_CB->setCurrentIndex(1); break;
+	case RsOpinion::POSITIVE: ui->ownOpinion_CB->setCurrentIndex(2); break;
 	default:
 		std::cerr << "Unexpected value in own opinion: "
 		          << static_cast<uint32_t>(info.mOwnOpinion) << std::endl;
@@ -1999,62 +2023,33 @@ void IdDialog::modifyReputation()
 
 	// trigger refresh when finished.
 	// basic / anstype are not needed.
-    //updateIdentity();
-    //updateIdList();
+    updateIdentity();
+    updateIdList();
 
 	return;
 }
-
+	
 void IdDialog::navigate(const RsGxsId& gxs_id)
 {
-    mIdListModel->debug_dump();
-#ifndef ID_DEBUG
+#ifdef ID_DEBUG
 	std::cerr << "IdDialog::navigate to " << gxs_id.toStdString() << std::endl;
 #endif
 
-    if(gxs_id.isNull())
-        return;
-
-    auto indx = mIdListModel->getIndexOfIdentity(gxs_id);
-
-    if(!indx.isValid())
-    {
-        RsErr() << "Invalid index found for identity " << gxs_id << std::endl;
-        return;
-    }
-    std::cerr << "Obtained index " << indx << ": id of that index is " << mIdListModel->getIdentity(indx) << std::endl;
-
-    QModelIndex proxy_indx = mProxyModel->mapFromSource(indx);
-
-    std::cerr << "Obtained proxy index " << proxy_indx << std::endl;
-
 	// in order to do this, we just select the correct ID in the ID list
-    Q_ASSERT(ui->idTreeWidget->model() == mProxyModel);
+	if (!gxs_id.isNull())
+	{
+		QList<QTreeWidgetItem*> select = ui->idTreeWidget->findItems(QString::fromStdString(gxs_id.toStdString()),Qt::MatchExactly | Qt::MatchRecursive | Qt::MatchWrap,RSID_COL_KEYID) ;
 
-    if(!proxy_indx.isValid())
-    {
-        std::cerr << "Cannot find item with ID " << gxs_id << " in ID list." << std::endl;
-        return;
-    }
-    std::cerr << "Row hidden? " << ui->idTreeWidget->isRowHidden(proxy_indx.row(),proxy_indx.parent()) << std::endl;
+		if(select.empty())
+		{
+			mIdToNavigate = RsGxsGroupId(gxs_id);
+			std::cerr << "Cannot find item with ID " << gxs_id << " in ID list." << std::endl;
+			return;
+		}
+		ui->idTreeWidget->setCurrentItem(*select.begin(),true);
+	}
 
-    {
-        auto ii = mProxyModel->mapToSource(proxy_indx);
-        std::cerr << "Remapping index to source: " << ii << std::endl;
-    }
-    ui->idTreeWidget->selectionModel()->select(proxy_indx,QItemSelectionModel::Current|QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-    {
-        auto lst = ui->idTreeWidget->selectionModel()->selectedIndexes();
-        std::cerr << "Just after calling select(), the selected index list has size " << lst.size() << std::endl;
-    }
-    ui->idTreeWidget->scrollTo(proxy_indx);//May change if model reloaded
-    ui->idTreeWidget->setFocus();
-
-    // This has to be done manually because for some reason the proxy model doesn't work with the selection model
-    // No signal is emitted when calling setCurrentIndex() above.
-
-    //mId = RsGxsGroupId(gxs_id);
-    //updateIdentity();
+	mIdToNavigate = RsGxsGroupId();
 }
 
 void IdDialog::updateDisplay(bool complete)
@@ -2072,49 +2067,6 @@ void IdDialog::updateDisplay(bool complete)
 	}
 }
 
-std::list<RsGxsId> IdDialog::getSelectedIdentities() const
-{
-    QModelIndexList selectedIndexes_proxy = ui->idTreeWidget->selectionModel()->selectedIndexes();
-    std::list<RsGxsId> res;
-
-#ifdef DEBUG_ID_DIALOG
-    std::cerr << "Parsing selected index list: " << std::endl;
-#endif
-    for(auto indx_proxy:selectedIndexes_proxy)
-    {
-        RsGxsId id;
-
-        if(indx_proxy.column() == RsIdentityListModel::COLUMN_THREAD_ID)	// this removes duplicates
-        {
-            auto indx = mProxyModel->mapToSource(indx_proxy);
-            auto id = mIdListModel->getIdentity(indx);
-
-#ifdef DEBUG_ID_DIALOG
-            std::cerr << "     indx: " << indx_proxy << "   original indx: " << indx << " identity: " << id << std::endl;
-#endif
-
-            if( !id.isNull() )
-                res.push_back(id);
-        }
-    }
-
-    return res;
-}
-
-RsGxsId IdDialog::getSelectedIdentity() const
-{
-    auto lst = getSelectedIdentities();
-
-#ifdef DEBUG_ID_DIALOG
-    std::cerr << "Selected identities has size " << lst.size() << std::endl;
-#endif
-
-    if(lst.size() != 1)
-        return RsGxsId();
-    else
-        return lst.front();
-}
-
 void IdDialog::addIdentity()
 {
 	IdEditDialog dlg(this);
@@ -2124,248 +2076,240 @@ void IdDialog::addIdentity()
 
 void IdDialog::removeIdentity()
 {
-    RsGxsId id = getSelectedIdentity();
+	QTreeWidgetItem *item = ui->idTreeWidget->currentItem();
+	if (!item)
+	{
+#ifdef ID_DEBUG
+		std::cerr << "IdDialog::editIdentity() Invalid item";
+		std::cerr << std::endl;
+#endif
+		return;
+	}
 
-    if(id.isNull())
-        return;
+	if ((QMessageBox::question(this, tr("Really delete?"), tr("Do you really want to delete this identity?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::No))== QMessageBox::Yes)
+	{
+		std::string keyId = item->text(RSID_COL_KEYID).toStdString();
 
-    if ((QMessageBox::question(this, tr("Really delete?"), tr("Do you really want to delete this identity?\nThis cannot be undone."), QMessageBox::Yes|QMessageBox::No, QMessageBox::No))== QMessageBox::Yes)
-        rsIdentity->deleteIdentity(id);
+		uint32_t dummyToken = 0;
+		RsGxsIdGroup group;
+		group.mMeta.mGroupId=RsGxsGroupId(keyId);
+		rsIdentity->deleteIdentity(dummyToken, group);
+	}
 }
 
 void IdDialog::editIdentity()
 {
-    RsGxsId id = getSelectedIdentity();
+	QTreeWidgetItem *item = ui->idTreeWidget->currentItem();
+	if (!item)
+	{
+#ifdef ID_DEBUG
+		std::cerr << "IdDialog::editIdentity() Invalid item";
+		std::cerr << std::endl;
+#endif
+		return;
+	}
 
-    if(id.isNull())
-        return;
+	RsGxsGroupId keyId = RsGxsGroupId(item->text(RSID_COL_KEYID).toStdString());
+	if (keyId.isNull()) {
+		return;
+	}
 
-    IdEditDialog dlg(this);
-    dlg.setupExistingId(RsGxsGroupId(id));
-    dlg.exec();
+	IdEditDialog dlg(this);
+	dlg.setupExistingId(keyId);
+	dlg.exec();
 }
 
 void IdDialog::filterIds()
 {
+	int filterColumn = ui->filterLineEdit->currentFilter();
 	QString text = ui->filterLineEdit->text();
 
-    int8_t ft=0;
-
-    if(!ui->idTreeWidget->isColumnHidden(RsIdentityListModel::COLUMN_THREAD_ID))    ft |= RsIdentityListModel::FILTER_TYPE_ID;
-    if(!ui->idTreeWidget->isColumnHidden(RsIdentityListModel::COLUMN_THREAD_NAME))  ft |= RsIdentityListModel::FILTER_TYPE_NAME;
-    if(!ui->idTreeWidget->isColumnHidden(RsIdentityListModel::COLUMN_THREAD_OWNER_NAME))  ft |= RsIdentityListModel::FILTER_TYPE_OWNER_NAME;
-    if(!ui->idTreeWidget->isColumnHidden(RsIdentityListModel::COLUMN_THREAD_OWNER_ID))  ft |= RsIdentityListModel::FILTER_TYPE_OWNER_ID;
-
-    mIdListModel->setFilter(ft,{ text });
+	ui->idTreeWidget->filterItems(filterColumn, text);
 }
 
-void IdDialog::headerContextMenuRequested(QPoint)
-{
-    QMenu displayMenu(this);
-
-    // create menu header
-    //QHBoxLayout *hbox = new QHBoxLayout(widget);
-    //hbox->setMargin(0);
-    //hbox->setSpacing(6);
-
-    auto addEntry = [&](const QString& name,RsIdentityListModel::Columns col)
-    {
-        QAction *action = displayMenu.addAction(QIcon(), name, this, SLOT(toggleColumnVisible()));
-        action->setCheckable(true);
-        action->setData(static_cast<int>(col));
-        action->setChecked(!ui->idTreeWidget->header()->isSectionHidden(col));
-    };
-
-    addEntry(tr("Id"),RsIdentityListModel::COLUMN_THREAD_ID);
-    addEntry(tr("Owner Id"),RsIdentityListModel::COLUMN_THREAD_OWNER_ID);
-    addEntry(tr("Owner Name"),RsIdentityListModel::COLUMN_THREAD_OWNER_NAME);
-    addEntry(tr("Reputation"),RsIdentityListModel::COLUMN_THREAD_REPUTATION);
-
-    //addEntry(tr("Name"),RsIdentityListModel::COLUMN_THREAD_NAME);
-
-    displayMenu.exec(QCursor::pos());
-}
-
-void IdDialog::toggleColumnVisible()
-{
-    QAction *action = dynamic_cast<QAction*>(sender());
-
-    std::cerr << "Aciton = " << (void*)action << std::endl;
-    if (!action)
-        return;
-
-    int column = action->data().toInt();
-    bool visible = action->isChecked();
-
-    ui->idTreeWidget->setColumnHidden(column, !visible);
-}
 void IdDialog::IdListCustomPopupMenu( QPoint )
 {
-    QMenu contextMenu(this);
+	QMenu *contextMenu = new QMenu(this);
 
-    std::list<RsGxsId> own_identities;
-    rsIdentity->getOwnIds(own_identities);
 
-    // make some stats about what's selected. If the same value is used for all selected items, it can be switched.
+	std::list<RsGxsId> own_identities;
+	rsIdentity->getOwnIds(own_identities);
 
-    auto lst = getSelectedIdentities();
+	// make some stats about what's selected. If the same value is used for all selected items, it can be switched.
 
-    if(lst.empty())
-        return ;
+	QList<QTreeWidgetItem *> selected_items = ui->idTreeWidget->selectedItems();
 
-    //bool root_node_present = false ;
-    bool one_item_owned_by_you = false ;
-    uint32_t n_positive_reputations = 0 ;
-    uint32_t n_negative_reputations = 0 ;
-    uint32_t n_neutral_reputations = 0 ;
-    uint32_t n_is_a_contact = 0 ;
-    uint32_t n_is_not_a_contact = 0 ;
-    uint32_t n_selected_items =0 ;
+	bool root_node_present = false ;
+	bool one_item_owned_by_you = false ;
+	uint32_t n_positive_reputations = 0 ;
+	uint32_t n_negative_reputations = 0 ;
+	uint32_t n_neutral_reputations = 0 ;
+	uint32_t n_is_a_contact = 0 ;
+	uint32_t n_is_not_a_contact = 0 ;
+	uint32_t n_selected_items =0 ;
 
-    for(auto& keyId :lst)
-    {
-        //if(it == allItem || it == contactsItem || it == ownItem)
-        //{
-        //	root_node_present = true ;
-        //	continue ;
-        //}
+	for(auto& it :selected_items)
+	{
+		if(it == allItem || it == contactsItem || it == ownItem)
+		{
+			root_node_present = true ;
+			continue ;
+		}
 
-        //uint32_t item_flags = mIdListModel->data(RSID_COL_KEYID,Qt::UserRole).toUInt() ;
+		uint32_t item_flags = it->data(RSID_COL_KEYID,Qt::UserRole).toUInt() ;
 
-        if(rsIdentity->isOwnId(keyId))
-            one_item_owned_by_you = true ;
+		if(item_flags & RSID_FILTER_OWNED_BY_YOU)
+			one_item_owned_by_you = true ;
 
 #ifdef ID_DEBUG
-        std::cerr << "  item flags = " << item_flags << std::endl;
+		std::cerr << "  item flags = " << item_flags << std::endl;
 #endif
-        RsIdentityDetails det ;
-        rsIdentity->getIdDetails(keyId,det) ;
+		RsGxsId keyId(it->text(RSID_COL_KEYID).toStdString());
 
-        switch(det.mReputation.mOwnOpinion)
-        {
-        case RsOpinion::NEGATIVE: ++n_negative_reputations; break;
-        case RsOpinion::POSITIVE: ++n_positive_reputations; break;
-        case RsOpinion::NEUTRAL:  ++n_neutral_reputations;  break;
-        }
+		RsIdentityDetails det ;
+		rsIdentity->getIdDetails(keyId,det) ;
 
-        ++n_selected_items;
+		switch(det.mReputation.mOwnOpinion)
+		{
+		case RsOpinion::NEGATIVE: ++n_negative_reputations; break;
+		case RsOpinion::POSITIVE: ++n_positive_reputations; break;
+		case RsOpinion::NEUTRAL:  ++n_neutral_reputations;  break;
+		}
 
-        if(rsIdentity->isARegularContact(keyId))
-            ++n_is_a_contact ;
-        else
-            ++n_is_not_a_contact ;
-    }
+		++n_selected_items;
 
-    if(!one_item_owned_by_you)
-    {
-        QFrame *widget = new QFrame(&contextMenu);
-        widget->setObjectName("gradFrame"); //Use qss
-        //widget->setStyleSheet( ".QWidget{background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #FEFEFE, stop:1 #E8E8E8); border: 1px solid #CCCCCC;}");
+		if(rsIdentity->isARegularContact(keyId))
+			++n_is_a_contact ;
+		else
+			++n_is_not_a_contact ;
+	}
 
-        // create menu header
-        QHBoxLayout *hbox = new QHBoxLayout(widget);
-        hbox->setMargin(0);
-        hbox->setSpacing(6);
+	if(!root_node_present)	// don't show menu if some of the root nodes are present
+	{
 
-        QLabel *iconLabel = new QLabel(widget);
-        iconLabel->setObjectName("trans_Icon");
-        QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
-        iconLabel->setPixmap(pix);
-        iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
-        hbox->addWidget(iconLabel);
+		if(!one_item_owned_by_you)
+		{
+			QFrame *widget = new QFrame(contextMenu);
+			widget->setObjectName("gradFrame"); //Use qss
+			//widget->setStyleSheet( ".QWidget{background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #FEFEFE, stop:1 #E8E8E8); border: 1px solid #CCCCCC;}");
 
-        QLabel *textLabel = new QLabel("<strong>" + ui->titleBarLabel->text() + "</strong>", widget);
-        textLabel->setObjectName("trans_Text");
-        hbox->addWidget(textLabel);
+			// create menu header
+			QHBoxLayout *hbox = new QHBoxLayout(widget);
+			hbox->setMargin(0);
+			hbox->setSpacing(6);
 
-        QSpacerItem *spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-        hbox->addItem(spacerItem);
+			QLabel *iconLabel = new QLabel(widget);
+			iconLabel->setObjectName("trans_Icon");
+			QPixmap pix = FilesDefs::getPixmapFromQtResourcePath(":/images/user/friends24.png").scaledToHeight(QFontMetricsF(iconLabel->font()).height()*1.5);
+			iconLabel->setPixmap(pix);
+			iconLabel->setMaximumSize(iconLabel->frameSize().height() + pix.height(), pix.width());
+			hbox->addWidget(iconLabel);
 
-        widget->setLayout(hbox);
+			QLabel *textLabel = new QLabel("<strong>" + ui->titleBarLabel->text() + "</strong>", widget);
+			textLabel->setObjectName("trans_Text");
+			hbox->addWidget(textLabel);
 
-        QWidgetAction *widgetAction = new QWidgetAction(this);
-        widgetAction->setDefaultWidget(widget);
-        contextMenu.addAction(widgetAction);
+			QSpacerItem *spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+			hbox->addItem(spacerItem);
 
-        if(n_selected_items == 1)		// if only one item is selected, allow to chat with this item
-        {
-            if(own_identities.size() <= 1)
-            {
-                QAction *action = contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/chats.png"), tr("Chat with this person"), this, SLOT(chatIdentity()));
+			widget->setLayout(hbox);
 
-                if(own_identities.empty())
-                    action->setEnabled(false) ;
-                else
-                    action->setData(QString::fromStdString((own_identities.front()).toStdString())) ;
-            }
-            else
-            {
-                QMenu *mnu = contextMenu.addMenu(FilesDefs::getIconFromQtResourcePath(":/icons/png/chats.png"),tr("Chat with this person as...")) ;
+			QWidgetAction *widgetAction = new QWidgetAction(this);
+			widgetAction->setDefaultWidget(widget);
+			contextMenu->addAction(widgetAction);
 
-                for(std::list<RsGxsId>::const_iterator it=own_identities.begin();it!=own_identities.end();++it)
-                {
-                    RsIdentityDetails idd ;
-                    rsIdentity->getIdDetails(*it,idd) ;
+			if(n_selected_items == 1)		// if only one item is selected, allow to chat with this item
+			{
+				if(own_identities.size() <= 1)
+				{
+                    QAction *action = contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/chats.png"), tr("Chat with this person"), this, SLOT(chatIdentity()));
 
-                    QPixmap pixmap ;
+					if(own_identities.empty())
+						action->setEnabled(false) ;
+					else
+						action->setData(QString::fromStdString((own_identities.front()).toStdString())) ;
+				}
+				else
+				{
+                    QMenu *mnu = contextMenu->addMenu(FilesDefs::getIconFromQtResourcePath(":/icons/png/chats.png"),tr("Chat with this person as...")) ;
 
-                    if(idd.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idd.mAvatar.mData, idd.mAvatar.mSize, pixmap,GxsIdDetails::SMALL))
-                        pixmap = GxsIdDetails::makeDefaultIcon(*it,GxsIdDetails::SMALL) ;
+					for(std::list<RsGxsId>::const_iterator it=own_identities.begin();it!=own_identities.end();++it)
+					{
+						RsIdentityDetails idd ;
+						rsIdentity->getIdDetails(*it,idd) ;
 
-                    QAction *action = mnu->addAction(QIcon(pixmap), QString("%1 (%2)").arg(QString::fromUtf8(idd.mNickname.c_str()), QString::fromStdString((*it).toStdString())), this, SLOT(chatIdentity()));
-                    action->setData(QString::fromStdString((*it).toStdString())) ;
-                }
-            }
-        }
-        // always allow to send messages
-        contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/mail/write-mail.png"), tr("Send message"), this, SLOT(sendMsg()));
+						QPixmap pixmap ;
 
-        contextMenu.addSeparator();
+						if(idd.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idd.mAvatar.mData, idd.mAvatar.mSize, pixmap,GxsIdDetails::SMALL))
+							pixmap = GxsIdDetails::makeDefaultIcon(*it,GxsIdDetails::SMALL) ;
 
-        if(n_is_a_contact == 0)
-            contextMenu.addAction(QIcon(), tr("Add to Contacts"), this, SLOT(addtoContacts()));
+						QAction *action = mnu->addAction(QIcon(pixmap), QString("%1 (%2)").arg(QString::fromUtf8(idd.mNickname.c_str()), QString::fromStdString((*it).toStdString())), this, SLOT(chatIdentity()));
+						action->setData(QString::fromStdString((*it).toStdString())) ;
+					}
+				}
+			}
+			// always allow to send messages
+            contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/mail/write-mail.png"), tr("Send message"), this, SLOT(sendMsg()));
 
-        if(n_is_not_a_contact == 0)
-            contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"), tr("Remove from Contacts"), this, SLOT(removefromContacts()));
-    }
-    if (n_selected_items==1)
-        contextMenu.addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
+			contextMenu->addSeparator();
 
-    contextMenu.addSeparator();
+			if(n_is_a_contact == 0)
+				contextMenu->addAction(QIcon(), tr("Add to Contacts"), this, SLOT(addtoContacts()));
 
-    if(n_positive_reputations == 0)	// only unban when all items are banned
-        contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-up.png"), tr("Set positive opinion"), this, SLOT(positivePerson()));
+			if (n_selected_items==1)
+				contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
 
-    if(n_neutral_reputations == 0)	// only unban when all items are banned
-        contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-neutral.png"), tr("Set neutral opinion"), this, SLOT(neutralPerson()));
+			if(n_is_not_a_contact == 0)
+                contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"), tr("Remove from Contacts"), this, SLOT(removefromContacts()));
 
-    if(n_negative_reputations == 0)
-        contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-down.png"), tr("Set negative opinion"), this, SLOT(negativePerson()));
+			contextMenu->addSeparator();
 
-    if(one_item_owned_by_you && n_selected_items==1)
-    {
-        contextMenu.addSeparator();
+			if(n_positive_reputations == 0)	// only unban when all items are banned
+                contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-up.png"), tr("Set positive opinion"), this, SLOT(positivePerson()));
 
-        contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EDIT),tr("Edit identity"),this,SLOT(editIdentity())) ;
-        contextMenu.addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"),tr("Delete identity"),this,SLOT(removeIdentity())) ;
-    }
+			if(n_neutral_reputations == 0)	// only unban when all items are banned
+                contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-neutral.png"), tr("Set neutral opinion"), this, SLOT(neutralPerson()));
 
-    //contextMenu = ui->idTreeWidget->createStandardContextMenu(contextMenu);
+			if(n_negative_reputations == 0)
+                contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/png/thumbs-down.png"), tr("Set negative opinion"), this, SLOT(negativePerson()));
+		}
 
-    contextMenu.exec(QCursor::pos());
+		if(one_item_owned_by_you && n_selected_items==1)
+		{
+			contextMenu->addSeparator();
+
+			contextMenu->addAction(QIcon(""),tr("Copy identity to clipboard"),this,SLOT(copyRetroshareLink())) ;
+			contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_EDIT),tr("Edit identity"),this,SLOT(editIdentity())) ;
+			contextMenu->addAction(FilesDefs::getIconFromQtResourcePath(":/icons/cancel.svg"),tr("Delete identity"),this,SLOT(removeIdentity())) ;
+		}
+
+	}
+
+	contextMenu = ui->idTreeWidget->createStandardContextMenu(contextMenu);
+
+	contextMenu->exec(QCursor::pos());
+	delete contextMenu;
 }
 
 void IdDialog::copyRetroshareLink()
 {
-    auto gxs_id = getSelectedIdentity();
+	QTreeWidgetItem *item = ui->idTreeWidget->currentItem();
 
-    if (gxs_id.isNull())
+	if (!item)
 	{
 		std::cerr << "IdDialog::editIdentity() Invalid item";
 		std::cerr << std::endl;
 		return;
 	}
 
+	RsGxsId gxs_id(item->text(RSID_COL_KEYID).toStdString());
+
+    if(gxs_id.isNull())
+    {
+        std::cerr << "Null GXS id. Something went wrong." << std::endl;
+        return ;
+    }
+
     RsIdentityDetails details ;
 
 	if(! rsIdentity->getIdDetails(gxs_id,details))
@@ -2403,33 +2347,35 @@ void IdDialog::copyRetroshareLink()
 	});
 }
 
-void IdDialog::chatIdentityItem(const QModelIndex& indx)
+void IdDialog::chatIdentity()
 {
-    auto toGxsId = mIdListModel->getIdentity(indx);
+	QTreeWidgetItem* item = ui->idTreeWidget->currentItem();
+	if (!item)
+	{
+		std::cerr << __PRETTY_FUNCTION__ << " Error. Invalid item!" << std::endl;
+		return;
+	}
 
-    if(toGxsId.isNull())
+	chatIdentityItem(item);
+}
+
+void IdDialog::chatIdentityItem(QTreeWidgetItem* item)
+{
+	if(!item)
 	{
 		std::cerr << __PRETTY_FUNCTION__ << " Error. Invalid item." << std::endl;
 		return;
 	}
-    chatIdentity(toGxsId);
-}
 
-void IdDialog::chatIdentity()
-{
-    auto id = getSelectedIdentity();
+	std::string&& toIdString(item->text(RSID_COL_KEYID).toStdString());
+	RsGxsId toGxsId(toIdString);
+	if(toGxsId.isNull())
+	{
+		std::cerr << __PRETTY_FUNCTION__ << " Error. Invalid destination id: "
+		          << toIdString << std::endl;
+		return;
+	}
 
-    if(id.isNull())
-    {
-        std::cerr << __PRETTY_FUNCTION__ << " Error. Invalid item!" << std::endl;
-        return;
-    }
-
-    chatIdentity(id);
-}
-
-void IdDialog::chatIdentity(const RsGxsId& toGxsId)
-{
 	RsGxsId fromGxsId;
 	QAction* action = qobject_cast<QAction*>(QObject::sender());
 	if(!action)
@@ -2448,7 +2394,8 @@ void IdDialog::chatIdentity(const RsGxsId& toGxsId)
 
 	if(fromGxsId.isNull())
 	{
-        std::cerr << __PRETTY_FUNCTION__ << " Error. Could not determine sender identity to open chat toward: " << toGxsId << std::endl;
+		std::cerr << __PRETTY_FUNCTION__ << " Error. Could not determine sender"
+		          << " identity to open chat toward: " << toIdString << std::endl;
 		return;
 	}
 
@@ -2465,12 +2412,12 @@ void IdDialog::chatIdentity(const RsGxsId& toGxsId)
 
 void IdDialog::sendMsg()
 {
-    auto lst = getSelectedIdentities();
+	QList<QTreeWidgetItem *> selected_items = ui->idTreeWidget->selectedItems();
 
-    if(lst.empty())
+	if(selected_items.empty())
 		return ;
 
-    if(lst.size() > 20)
+	if(selected_items.size() > 20)
 		if(QMessageBox::warning(nullptr,tr("Too many identities"),tr("<p>It is not recommended to send a message to more than 20 persons at once. Large scale diffusion of data (including friend invitations) are much more efficiently handled by forums. Click ok to proceed anyway.</p>"),QMessageBox::Ok|QMessageBox::Cancel,QMessageBox::Cancel)==QMessageBox::Cancel)
 			return;
 
@@ -2478,10 +2425,15 @@ void IdDialog::sendMsg()
 	if (nMsgDialog == NULL)
 		return;
 
-    for(const auto& id : lst)
-        nMsgDialog->addRecipient(MessageComposer::TO,  id);
+	for(auto& it : selected_items)
+	{
+		QTreeWidgetItem *item = it ;
 
-    nMsgDialog->show();
+		std::string keyId = item->text(RSID_COL_KEYID).toStdString();
+
+		nMsgDialog->addRecipient(MessageComposer::TO,  RsGxsId(keyId));
+	}
+	nMsgDialog->show();
 	nMsgDialog->activateWindow();
 
 	/* window will destroy itself! */
@@ -2494,11 +2446,14 @@ QString IdDialog::inviteMessage()
 
 void IdDialog::sendInvite()
 {
-    auto id = getSelectedIdentity();
-
-    if(id.isNull())
+	QTreeWidgetItem *item = ui->idTreeWidget->currentItem();
+	if (!item)
+	{
 		return;
+	}
 
+    RsGxsId id(ui->lineEdit_KeyId->text().toStdString());
+    
     //if ((QMessageBox::question(this, tr("Send invite?"),tr("Do you really want send a invite with your Certificate?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
 	{
         MessageComposer::sendInvite(id,false);
@@ -2506,60 +2461,83 @@ void IdDialog::sendInvite()
         ui->info_Frame_Invite->show();
         ui->inviteButton->setEnabled(false);
 	}
-
+    
 
 }
 
 void IdDialog::negativePerson()
 {
-    auto lst = getSelectedIdentities();
+	QList<QTreeWidgetItem *> selected_items = ui->idTreeWidget->selectedItems();
+	for(auto& it : selected_items)
+	{
+		QTreeWidgetItem *item = it ;
 
-    for(const auto& id : lst)
-        rsReputations->setOwnOpinion(id, RsOpinion::NEGATIVE);
+		std::string Id = item->text(RSID_COL_KEYID).toStdString();
 
-    updateIdentity();
-    updateIdListRequest();
+		rsReputations->setOwnOpinion(RsGxsId(Id), RsOpinion::NEGATIVE);
+	}
+
+	updateIdentity();
+	updateIdList();
 }
 
 void IdDialog::neutralPerson()
 {
-    auto lst = getSelectedIdentities();
+	QList<QTreeWidgetItem *> selected_items = ui->idTreeWidget->selectedItems();
+	for(auto& it : selected_items)
+	{
+		QTreeWidgetItem *item = it ;
 
-    for(const auto& id : lst)
-        rsReputations->setOwnOpinion(id, RsOpinion::NEUTRAL);
+		std::string Id = item->text(RSID_COL_KEYID).toStdString();
 
-    updateIdentity();
-    updateIdListRequest();
+		rsReputations->setOwnOpinion(RsGxsId(Id), RsOpinion::NEUTRAL);
+	}
+
+	updateIdentity();
+	updateIdList();
 }
 void IdDialog::positivePerson()
 {
-    auto lst = getSelectedIdentities();
+	QList<QTreeWidgetItem *> selected_items = ui->idTreeWidget->selectedItems();
+	for(auto& it : selected_items)
+	{
+		QTreeWidgetItem *item = it ;
 
-    for(const auto& id : lst)
-        rsReputations->setOwnOpinion(id, RsOpinion::POSITIVE);
+		std::string Id = item->text(RSID_COL_KEYID).toStdString();
 
-    updateIdentity();
-    updateIdListRequest();
+		rsReputations->setOwnOpinion(RsGxsId(Id), RsOpinion::POSITIVE);
+	}
+
+	updateIdentity();
+	updateIdList();
 }
 
 void IdDialog::addtoContacts()
 {
-    auto lst = getSelectedIdentities();
+	QList<QTreeWidgetItem *> selected_items = ui->idTreeWidget->selectedItems();
+	for(auto& it : selected_items)
+	{
+		QTreeWidgetItem *item = it ;
+		std::string Id = item->text(RSID_COL_KEYID).toStdString();
 
-    for(const auto& id : lst)
-        rsIdentity->setAsRegularContact(id,true);
+		rsIdentity->setAsRegularContact(RsGxsId(Id),true);
+	}
 
-    updateIdListRequest();
+	updateIdList();
 }
 
 void IdDialog::removefromContacts()
 {
-    auto lst = getSelectedIdentities();
+	QList<QTreeWidgetItem *> selected_items = ui->idTreeWidget->selectedItems();
+	for(auto& it : selected_items)
+	{
+		QTreeWidgetItem *item = it ;
+		std::string Id = item->text(RSID_COL_KEYID).toStdString();
 
-    for(const auto& id : lst)
-        rsIdentity->setAsRegularContact(id,false);
+		rsIdentity->setAsRegularContact(RsGxsId(Id),false);
+	}
 
-    updateIdListRequest();
+	updateIdList();
 }
 
 void IdDialog::on_closeInfoFrameButton_Invite_clicked()
@@ -2615,174 +2593,3 @@ void IdDialog::restoreExpandedCircleItems(const std::vector<bool>& expanded_root
     restoreTopLevel(mMyCircleItem,2);
 }
 
-void IdDialog::applyWhileKeepingTree(std::function<void()> predicate)
-{
-    std::set<QStringList> expanded,selected;
-
-    saveExpandedPathsAndSelection_idTreeView(expanded, selected);
-#ifdef DEBUG_NEW_FRIEND_LIST
-    std::cerr << "After collecting selection, selected paths is: \"" << selected.toStdString() << "\", " ;
-    std::cerr << "expanded paths are: " << std::endl;
-    for(auto path:expanded)
-        std::cerr << "        \"" << path.toStdString() << "\"" << std::endl;
-    std::cerr << "Current sort column is: " << mLastSortColumn << " and order is " << mLastSortOrder << std::endl;
-#endif
-
-    // This is a hack to avoid crashes on windows while calling endInsertRows(). I'm not sure wether these crashes are
-    // due to a Qt bug, or a misuse of the proxy model on my side. Anyway, this solves them for good.
-    // As a side effect we need to save/restore hidden columns because setSourceModel() resets this setting.
-
-    // save hidden columns and sizes
-    std::vector<bool> col_visible(RsIdentityListModel::COLUMN_THREAD_NB_COLUMNS);
-    std::vector<int> col_sizes(RsIdentityListModel::COLUMN_THREAD_NB_COLUMNS);
-
-    for(int i=0;i<RsIdentityListModel::COLUMN_THREAD_NB_COLUMNS;++i)
-    {
-        col_visible[i] = !ui->idTreeWidget->isColumnHidden(i);
-        col_sizes[i] = ui->idTreeWidget->columnWidth(i);
-    }
-
-#ifdef SUSPENDED
-#ifdef DEBUG_NEW_FRIEND_LIST
-    std::cerr << "Applying predicate..." << std::endl;
-#endif
-#endif
-    mProxyModel->setSourceModel(nullptr);
-    predicate();
-    mProxyModel->setSourceModel(mIdListModel);
-
-    restoreExpandedPathsAndSelection_idTreeView(expanded,selected);
-    // restore hidden columns
-    for(uint32_t i=0;i<RsIdentityListModel::COLUMN_THREAD_NB_COLUMNS;++i)
-    {
-        ui->idTreeWidget->setColumnHidden(i,!col_visible[i]);
-        ui->idTreeWidget->setColumnWidth(i,col_sizes[i]);
-    }
-
-    mProxyModel->setSortingEnabled(true);
-    mProxyModel->sort(mLastSortColumn,mLastSortOrder);
-    mProxyModel->setSortingEnabled(false);
-#ifdef SUSPENDED
-    // restore sorting
-    // sortColumn(mLastSortColumn,mLastSortOrder);
-#ifdef DEBUG_NEW_FRIEND_LIST
-    std::cerr << "Sorting again with sort column: " << mLastSortColumn << " and order " << mLastSortOrder << std::endl;
-#endif
-
-//    if(selected_index.isValid())
-//        ui->idTreeWidget->scrollTo(selected_index);
-#endif
-}
-
-void IdDialog::saveExpandedPathsAndSelection_idTreeView(std::set<QStringList>& expanded, std::set<QStringList>& selected)
-{
-#ifdef DEBUG_ID_DIALOG
-    std::cerr << "Saving expended paths and selection..." << std::endl;
-#endif
-
-    for(int row = 0; row < mProxyModel->rowCount(); ++row)
-        recursSaveExpandedItems_idTreeView(mProxyModel->index(row,0),QStringList(),expanded,selected);
-}
-
-void IdDialog::restoreExpandedPathsAndSelection_idTreeView(const std::set<QStringList>& expanded, const std::set<QStringList>& selected)
-{
-#ifdef DEBUG_ID_DIALOG
-    std::cerr << "Restoring expanded paths and selection..." << std::endl;
-    std::cerr << "   expanded: " << expanded.size() << " items" << std::endl;
-    std::cerr << "   selected: " << selected.size() << " items" << std::endl;
-#endif
-    ui->idTreeWidget->blockSignals(true) ;
-    ui->idTreeWidget->selectionModel()->blockSignals(true) ;
-
-    ui->idTreeWidget->clearSelection();
-
-    for(int row = 0; row < mProxyModel->rowCount(); ++row)
-        recursRestoreExpandedItems_idTreeView(mProxyModel->index(row,0),QStringList(),expanded,selected);
-
-    ui->idTreeWidget->selectionModel()->blockSignals(false) ;
-    ui->idTreeWidget->blockSignals(false) ;
-}
-
-void IdDialog::recursSaveExpandedItems_idTreeView(const QModelIndex& proxy_index,const QStringList& parent_path,std::set<QStringList>& expanded,std::set<QStringList>& selected)
-{
-    QStringList local_path = parent_path;
-
-    local_path.push_back(mIdListModel->indexIdentifier(mProxyModel->mapToSource(proxy_index)));
-
-    if(ui->idTreeWidget->isExpanded(proxy_index))
-    {
-#ifdef DEBUG_ID_DIALOG
-        std::cerr << "Adding expanded path ";
-        for(auto L:local_path) std::cerr << "\"" << L.toStdString() << "\" " ; std::cerr << std::endl;
-#endif
-        if(proxy_index.isValid())
-            expanded.insert(local_path) ;
-
-        for(int row=0;row<mProxyModel->rowCount(proxy_index);++row)
-            recursSaveExpandedItems_idTreeView(proxy_index.child(row,0),local_path,expanded,selected) ;
-    }
-
-    if(ui->idTreeWidget->selectionModel()->isSelected(proxy_index))
-    {
-#ifdef DEBUG_ID_DIALOG
-        std::cerr << "Adding selected path ";
-        for(auto L:local_path) std::cerr << "\"" << L.toStdString() << "\" " ; std::cerr << std::endl;
-#endif
-        selected.insert(local_path);
-    }
-}
-
-void IdDialog::recursRestoreExpandedItems_idTreeView(const QModelIndex& proxy_index,const QStringList& parent_path,const std::set<QStringList>& expanded,const std::set<QStringList>& selected)
-{
-    QStringList local_path = parent_path;
-    local_path.push_back(mIdListModel->indexIdentifier(mProxyModel->mapToSource(proxy_index)));
-
-#ifdef DEBUG_ID_DIALOG
-    std::cerr << "Local path = " ;  for(auto L:local_path) std::cerr << "\"" << L.toStdString() << "\" " ; std::cerr << std::endl;
-#endif
-
-    if(expanded.find(local_path) != expanded.end())
-    {
-#ifdef DEBUG_ID_DIALOG
-        std::cerr << "  re expanding " ;
-        for(auto L:local_path) std::cerr << "\"" << L.toStdString() << "\" " ; std::cerr << std::endl;
-#endif
-
-        ui->idTreeWidget->setExpanded(proxy_index,true) ;
-
-        for(int row=0;row<mProxyModel->rowCount(proxy_index);++row)
-            recursRestoreExpandedItems_idTreeView(proxy_index.child(row,0),local_path,expanded,selected) ;
-    }
-
-    if(selected.find(local_path) != selected.end())
-    {
-#ifdef DEBUG_ID_DIALOG
-        std::cerr << "Restoring selected path ";
-        for(auto L:local_path) std::cerr << "\"" << L.toStdString() << "\" " ; std::cerr << std::endl;
-#endif
-        ui->idTreeWidget->selectionModel()->select(proxy_index, QItemSelectionModel::Current|QItemSelectionModel::Select | QItemSelectionModel::Rows);
-    }
-}
-
-void IdDialog::sortColumn(int col,Qt::SortOrder so)
-{
-#ifdef DEBUG_NEW_FRIEND_LIST
-    std::cerr << "Sorting with column=" << col << " and order=" << so << std::endl;
-#endif
-    std::set<QStringList> expanded_indexes,selected_indexes;
-
-    saveExpandedPathsAndSelection_idTreeView(expanded_indexes, selected_indexes);
-    whileBlocking(ui->idTreeWidget)->clearSelection();
-
-    mProxyModel->setSortingEnabled(true);
-    mProxyModel->sort(col,so);
-    mProxyModel->setSortingEnabled(false);
-
-    restoreExpandedPathsAndSelection_idTreeView(expanded_indexes,selected_indexes);
-
-    //if(selected_index.isValid())
-    //    ui->peerTreeWidget->scrollTo(selected_index);
-
-    mLastSortColumn = col;
-    mLastSortOrder = so;
-}
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.h b/retroshare-gui/src/gui/Identity/IdDialog.h
index d4629a5af..403b3a437 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.h
+++ b/retroshare-gui/src/gui/Identity/IdDialog.h
@@ -22,10 +22,8 @@
 #define IDENTITYDIALOG_H
 
 #include "gui/gxs/RsGxsUpdateBroadcastPage.h"
-#include "util/FontSizeHandler.h"
 
-#include "retroshare/rsidentity.h"
-#include "IdentityListModel.h"
+#include <retroshare/rsidentity.h>
 
 #include <QTimer>
 
@@ -36,11 +34,7 @@ class IdDialog;
 }
 
 class UIStateHelper;
-class QStyledItemDelegate;
 class QTreeWidgetItem;
-class RsIdentityListModel;
-class IdListSortFilterProxyModel;
-class QItemSelection;
 
 class IdDialog : public MainPage
 {
@@ -64,7 +58,6 @@ protected:
 	void loadIdentity(RsGxsIdGroup id_data);
 
 	void loadCircles(const std::list<RsGroupMetaData>& circle_metas);
-    void updateIdListRequest();
 
 	//void requestCircleGroupData(const RsGxsCircleId& circle_id);
 	bool getItemCircleId(QTreeWidgetItem *item,RsGxsCircleId& id) ;
@@ -73,13 +66,13 @@ protected:
 
 
 private slots:
-    void updateIdList();
-    void updateCircles();
-    void createExternalCircle();
+	void updateIdList();
+	void updateCircles();
+
+	void createExternalCircle();
 	void showEditExistingCircle();
 	void updateCirclesDisplay();
 	void toggleAutoBanIdentities(bool b);
-    void sortColumn(int col,Qt::SortOrder so);
 
 	void acceptCircleSubscription() ;
 	void cancelCircleSubscription() ;
@@ -93,20 +86,17 @@ private slots:
 	void removeIdentity();
 	void editIdentity();
 	void chatIdentity();
-    void chatIdentityItem(const QModelIndex &indx);
-    void chatIdentity(const RsGxsId& toGxsId);
-    void sendMsg();
+	void chatIdentityItem(QTreeWidgetItem* item);
+	void sendMsg();
 	void copyRetroshareLink();
 	void on_closeInfoFrameButton_Invite_clicked();
 
-    void updateSelection(const QItemSelection &new_sel, const QItemSelection &old_sel);
+	void updateSelection();
 
 	void modifyReputation();
 
 	/** Create the context popup menu and it's submenus */
 	void IdListCustomPopupMenu( QPoint point );
-    void headerContextMenuRequested(QPoint);
-    void toggleColumnVisible();
 
 	void CircleListCustomPopupMenu(QPoint point) ;
 #ifdef SUSPENDED
@@ -127,12 +117,7 @@ private:
 	void processSettings(bool load);
 	QString createUsageString(const RsIdentityUsage& u) const;
 
-    void saveExpandedPathsAndSelection_idTreeView(std::set<QStringList> &expanded, std::set<QStringList> &selected);
-    void restoreExpandedPathsAndSelection_idTreeView(const std::set<QStringList>& expanded, const std::set<QStringList>& selelected);
-    void recursSaveExpandedItems_idTreeView(const QModelIndex& index, const QStringList& parent_path, std::set<QStringList>& expanded, std::set<QStringList>& selected);
-    void recursRestoreExpandedItems_idTreeView(const QModelIndex& index,const QStringList& parent_path,const std::set<QStringList>& expanded,const std::set<QStringList>& selected);
-
-    void requestIdData(std::list<RsGxsGroupId> &ids);
+	void requestIdData(std::list<RsGxsGroupId> &ids);
 	bool fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item, const RsPgpId &ownPgpId, int accept);
 	void insertIdList(uint32_t token);
 	void filterIds();
@@ -149,32 +134,20 @@ private:
 private:
 	UIStateHelper *mStateHelper;
 
+	QTreeWidgetItem *contactsItem;
+	QTreeWidgetItem *allItem;
+	QTreeWidgetItem *ownItem;
 	QTreeWidgetItem *mExternalBelongingCircleItem;
 	QTreeWidgetItem *mExternalOtherCircleItem;
 	QTreeWidgetItem *mMyCircleItem;
 	RsGxsUpdateBroadcastBase *mCirclesBroadcastBase ;
 
-    int mLastSortColumn;
-    Qt::SortOrder mLastSortOrder;
-
-    void saveExpandedCircleItems(std::vector<bool> &expanded_root_items, std::set<RsGxsCircleId>& expanded_circle_items) const;
+	void saveExpandedCircleItems(std::vector<bool> &expanded_root_items, std::set<RsGxsCircleId>& expanded_circle_items) const;
 	void restoreExpandedCircleItems(const std::vector<bool>& expanded_root_items,const std::set<RsGxsCircleId>& expanded_circle_items);
 
-    void applyWhileKeepingTree(std::function<void()> predicate);
-
-    RsGxsId getSelectedIdentity() const;
-    std::list<RsGxsId> getSelectedIdentities() const;
-
-    RsGxsGroupId mId;
+	RsGxsGroupId mId;
 	RsGxsGroupId mIdToNavigate;
 	int filter;
-    bool mColumnSizeAlreadySet; // remembers if we already did some size set. If not, automatically stretch to content.
-
-    QStyledItemDelegate *mElidedLabelDelegate;
-    QStyledItemDelegate *mReputationDelegate;
-
-    RsIdentityListModel *mIdListModel;
-    IdListSortFilterProxyModel *mProxyModel;
 
 	void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
 	RsEventsHandlerId_t mEventHandlerId_identity;
@@ -184,8 +157,6 @@ private:
 	bool needUpdateIdsOnNextShow;
 	bool needUpdateCirclesOnNextShow;
 
-	FontSizeHandler mFontSizeHandler;
-
 	/* UI -  Designer */
 	Ui::IdDialog *ui;
 };
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui
index 37522524e..7687c321d 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.ui
+++ b/retroshare-gui/src/gui/Identity/IdDialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>878</width>
+    <width>800</width>
     <height>584</height>
    </rect>
   </property>
@@ -127,7 +127,7 @@
          <enum>Qt::NoFocus</enum>
         </property>
         <property name="icon">
-         <iconset resource="../images.qrc">
+         <iconset resource="../icons.qrc">
           <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
         </property>
         <property name="checkable">
@@ -154,10 +154,10 @@
        <item>
         <widget class="QFrame" name="toolBarFrame">
          <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QHBoxLayout" name="toolBarFrameHLayout">
           <property name="leftMargin">
@@ -173,11 +173,7 @@
            <number>1</number>
           </property>
           <item>
-           <widget class="LineEditClear" name="filterLineEdit">
-            <property name="placeholderText">
-             <string>Search...</string>
-            </property>
-           </widget>
+           <widget class="LineEditClear" name="filterLineEdit"/>
           </item>
           <item>
            <widget class="QToolButton" name="toolButton_New">
@@ -215,13 +211,18 @@
         </widget>
        </item>
        <item>
-        <widget class="QTreeView" name="idTreeWidget">
+        <widget class="RSTreeWidget" name="idTreeWidget">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
          <property name="contextMenuPolicy">
           <enum>Qt::CustomContextMenu</enum>
          </property>
@@ -240,9 +241,39 @@
          <property name="sortingEnabled">
           <bool>true</bool>
          </property>
-         <attribute name="headerCascadingSectionResizes">
-          <bool>true</bool>
+         <attribute name="headerStretchLastSection">
+          <bool>false</bool>
          </attribute>
+         <column>
+          <property name="text">
+           <string>Persons</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Identity ID</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Owned by</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="toolTip">
+           <string>Votes</string>
+          </property>
+          <property name="textAlignment">
+           <set>AlignLeading|AlignVCenter</set>
+          </property>
+          <property name="icon">
+           <iconset resource="../icons.qrc">
+            <normaloff>:/icons/flag-green.png</normaloff>:/icons/flag-green.png</iconset>
+          </property>
+         </column>
         </widget>
        </item>
       </layout>
@@ -270,206 +301,268 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>535</width>
-             <height>784</height>
+             <width>466</width>
+             <height>738</height>
             </rect>
            </property>
-           <layout class="QGridLayout" name="gridLayout_3">
-            <item row="0" column="0" rowspan="2">
-             <layout class="QVBoxLayout" name="verticalLayout">
-              <property name="spacing">
-               <number>3</number>
-              </property>
-              <item>
-               <layout class="QGridLayout" name="gridLayout_2">
-                <item row="1" column="0">
-                 <widget class="QLabel" name="avatarLabel">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="minimumSize">
-                   <size>
-                    <width>128</width>
-                    <height>128</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>128</width>
-                    <height>128</height>
-                   </size>
-                  </property>
-                  <property name="frameShape">
-                   <enum>QFrame::StyledPanel</enum>
-                  </property>
-                  <property name="frameShadow">
-                   <enum>QFrame::Raised</enum>
-                  </property>
-                  <property name="text">
-                   <string extracomment="Click here to change your avatar">Your Avatar</string>
-                  </property>
-                  <property name="scaledContents">
-                   <bool>true</bool>
-                  </property>
-                  <property name="alignment">
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item row="3" column="0">
-                 <widget class="QPushButton" name="editButton">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Edit Identity</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="2" column="0">
-                 <widget class="QPushButton" name="inviteButton">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Send Invite</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="avatarOpinionHLayout">
-                <property name="spacing">
-                 <number>6</number>
-                </property>
-                <property name="topMargin">
-                 <number>2</number>
-                </property>
-                <item>
-                 <widget class="QLabel" name="label_PosIcon">
-                  <property name="maximumSize">
-                   <size>
-                    <width>34</width>
-                    <height>34</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string/>
-                  </property>
-                  <property name="pixmap">
-                   <pixmap resource="../icons.qrc">:/icons/png/thumbs-up.png</pixmap>
-                  </property>
-                  <property name="scaledContents">
-                   <bool>true</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="label_positive">
-                  <property name="font">
-                   <font>
-                    <pointsize>16</pointsize>
-                   </font>
-                  </property>
-                  <property name="toolTip">
-                   <string>Positive votes</string>
-                  </property>
-                  <property name="text">
-                   <string>0</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="Line" name="line_Opinion">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="label_NegIcon">
-                  <property name="maximumSize">
-                   <size>
-                    <width>34</width>
-                    <height>34</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string/>
-                  </property>
-                  <property name="pixmap">
-                   <pixmap resource="../icons.qrc">:/icons/png/thumbs-down.png</pixmap>
-                  </property>
-                  <property name="scaledContents">
-                   <bool>true</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="label_negative">
-                  <property name="font">
-                   <font>
-                    <pointsize>16</pointsize>
-                   </font>
-                  </property>
-                  <property name="toolTip">
-                   <string>Negative votes</string>
-                  </property>
-                  <property name="text">
-                   <string>0</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <spacer name="avatarVSpacer">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>118</width>
-                  <height>17</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </item>
-            <item row="0" column="1">
-             <widget class="ElidedLabel" name="headerTextLabel_Person">
-              <property name="font">
-               <font>
-                <pointsize>22</pointsize>
-               </font>
-              </property>
-              <property name="text">
-               <string>People</string>
-              </property>
-              <property name="textInteractionFlags">
-               <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QGroupBox" name="detailsGroupBox">
+           <layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">
+            <item>
+             <widget class="QFrame" name="headerBFramePerson">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+               <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+              <layout class="QGridLayout" name="headerBFramePersonGLayout">
+               <property name="horizontalSpacing">
+                <number>12</number>
+               </property>
+               <item row="0" column="3">
+                <layout class="QVBoxLayout" name="headerFramePersonVLayout">
+                 <item>
+                  <widget class="ElidedLabel" name="headerTextLabel_Person">
+                   <property name="font">
+                    <font>
+                     <pointsize>22</pointsize>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>People</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QFrame" name="info_Frame_Invite">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="palette">
+                    <palette>
+                     <active>
+                      <colorrole role="WindowText">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>0</red>
+                         <green>0</green>
+                         <blue>0</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                      <colorrole role="Base">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>255</red>
+                         <green>255</green>
+                         <blue>255</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                      <colorrole role="Window">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>255</red>
+                         <green>255</green>
+                         <blue>178</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                     </active>
+                     <inactive>
+                      <colorrole role="WindowText">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>0</red>
+                         <green>0</green>
+                         <blue>0</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                      <colorrole role="Base">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>255</red>
+                         <green>255</green>
+                         <blue>255</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                      <colorrole role="Window">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>255</red>
+                         <green>255</green>
+                         <blue>178</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                     </inactive>
+                     <disabled>
+                      <colorrole role="WindowText">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>154</red>
+                         <green>154</green>
+                         <blue>154</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                      <colorrole role="Base">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>255</red>
+                         <green>255</green>
+                         <blue>178</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                      <colorrole role="Window">
+                       <brush brushstyle="SolidPattern">
+                        <color alpha="255">
+                         <red>255</red>
+                         <green>255</green>
+                         <blue>178</blue>
+                        </color>
+                       </brush>
+                      </colorrole>
+                     </disabled>
+                    </palette>
+                   </property>
+                   <property name="autoFillBackground">
+                    <bool>true</bool>
+                   </property>
+                   <property name="styleSheet">
+                    <string notr="true"/>
+                   </property>
+                   <property name="frameShape">
+                    <enum>QFrame::Box</enum>
+                   </property>
+                   <layout class="QHBoxLayout" name="info_Frame_Invite_HL">
+                    <property name="leftMargin">
+                     <number>6</number>
+                    </property>
+                    <property name="topMargin">
+                     <number>6</number>
+                    </property>
+                    <property name="rightMargin">
+                     <number>6</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>6</number>
+                    </property>
+                    <item>
+                     <widget class="QLabel" name="infoPixmap_Invite">
+                      <property name="maximumSize">
+                       <size>
+                        <width>16</width>
+                        <height>16</height>
+                       </size>
+                      </property>
+                      <property name="text">
+                       <string/>
+                      </property>
+                      <property name="pixmap">
+                       <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QLabel" name="infoLabel_Invite">
+                      <property name="text">
+                       <string notr="true">Invite messages stay into your Outbox until an acknowledgement of receipt has been received.</string>
+                      </property>
+                      <property name="wordWrap">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QToolButton" name="closeInfoFrameButton_Invite">
+                      <property name="maximumSize">
+                       <size>
+                        <width>16</width>
+                        <height>16</height>
+                       </size>
+                      </property>
+                      <property name="focusPolicy">
+                       <enum>Qt::NoFocus</enum>
+                      </property>
+                      <property name="toolTip">
+                       <string>Close</string>
+                      </property>
+                      <property name="styleSheet">
+                       <string notr="true">QToolButton
+{
+ border-image: url(:/images/closenormal.png) 
+}
+                                
+QToolButton:hover 
+{
+border-image: url(:/images/closehover.png) 
+}
+                                
+QToolButton:pressed  {
+border-image: url(:/images/closepressed.png) 
+}</string>
+                      </property>
+                      <property name="autoRaise">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item row="0" column="0" rowspan="2">
+                <widget class="QLabel" name="avLabel_Person">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimumSize">
+                  <size>
+                   <width>64</width>
+                   <height>64</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>1000</width>
+                   <height>1000</height>
+                  </size>
+                 </property>
+                 <property name="styleSheet">
+                  <string notr="true"/>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                 <property name="scaledContents">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="detailsGroupBox">
               <property name="minimumSize">
                <size>
                 <width>0</width>
@@ -477,106 +570,34 @@
                </size>
               </property>
               <property name="title">
-               <string/>
+               <string>Identity info</string>
               </property>
               <layout class="QGridLayout" name="gridLayout">
-               <property name="topMargin">
-                <number>9</number>
-               </property>
-               <item row="9" column="1">
-                <widget class="QCheckBox" name="autoBanIdentities_CB">
-                 <property name="toolTip">
-                  <string>Auto-Ban all identities signed by the same node</string>
-                 </property>
+               <item row="13" column="0">
+                <widget class="QLabel" name="neighborNodesOpinion_LB">
                  <property name="text">
-                  <string>Auto-Ban profile</string>
+                  <string>Friend votes:</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="1">
-                <widget class="QLineEdit" name="neighborNodesOpinion_TF">
-                 <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="9" column="0">
-                <widget class="QLabel" name="banoption_label">
-                 <property name="text">
-                  <string>Ban-option:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QLineEdit" name="lineEdit_Type">
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="5" column="1">
-                <widget class="QLineEdit" name="lineEdit_LastUsed">
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label_KeyId">
-                 <property name="text">
-                  <string>Identity ID :</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="5" column="0">
-                <widget class="QLabel" name="label_LastUsed">
-                 <property name="text">
-                  <string>Last used:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="6" column="0" colspan="2">
+               <item row="9" column="0" colspan="2">
                 <widget class="Line" name="line_IdInfo">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="0">
-                <widget class="QLabel" name="label_GpgId">
-                 <property name="text">
-                  <string>Owner node ID :</string>
+               <item row="4" column="1">
+                <widget class="QLineEdit" name="lineEdit_GpgName">
+                 <property name="enabled">
+                  <bool>true</bool>
                  </property>
-                </widget>
-               </item>
-               <item row="4" column="0">
-                <widget class="QLabel" name="label_PublishTS">
-                 <property name="text">
-                  <string>Created on :</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="10" column="0">
-                <widget class="QLabel" name="neighborNodesOpinion_LB">
-                 <property name="text">
-                  <string>Friend votes:</string>
-                 </property>
-                 <property name="wordWrap">
+                 <property name="readOnly">
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_Type">
-                 <property name="text">
-                  <string>Type:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
+               <item row="1" column="1">
                 <widget class="QLineEdit" name="lineEdit_KeyId">
                  <property name="enabled">
                   <bool>true</bool>
@@ -586,14 +607,133 @@
                  </property>
                 </widget>
                </item>
-               <item row="7" column="0" rowspan="2">
+               <item row="6" column="0">
+                <widget class="QLabel" name="label_LastUsed">
+                 <property name="text">
+                  <string>Last used:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="12" column="1">
+                <widget class="QCheckBox" name="autoBanIdentities_CB">
+                 <property name="toolTip">
+                  <string>Auto-Ban all identities signed by the same node</string>
+                 </property>
+                 <property name="text">
+                  <string>Auto-Ban profile</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="1">
+                <widget class="QLineEdit" name="lineEdit_PublishTS">
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QLineEdit" name="lineEdit_Nickname">
+                 <property name="enabled">
+                  <bool>true</bool>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="3" column="1">
+                <widget class="QLineEdit" name="lineEdit_GpgId">
+                 <property name="enabled">
+                  <bool>true</bool>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="14" column="1">
+                <widget class="QLineEdit" name="overallOpinion_TF">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends'.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="10" column="0" rowspan="2">
                 <widget class="QLabel" name="label_YourOpinion">
                  <property name="text">
                   <string>Your opinion:</string>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="0" colspan="2">
+               <item row="14" column="0">
+                <widget class="QLabel" name="overallOpinion_LB">
+                 <property name="font">
+                  <font>
+                   <weight>75</weight>
+                   <bold>true</bold>
+                  </font>
+                 </property>
+                 <property name="text">
+                  <string>Overall:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="0">
+                <widget class="QLabel" name="label_PublishTS">
+                 <property name="text">
+                  <string>Created on :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QLabel" name="label_Nickname">
+                 <property name="text">
+                  <string>Identity name :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_KeyId">
+                 <property name="text">
+                  <string>Identity ID :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="13" column="1">
+                <widget class="QLineEdit" name="neighborNodesOpinion_TF">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QLineEdit" name="lineEdit_Type">
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_Type">
+                 <property name="text">
+                  <string>Type:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="1">
+                <widget class="QLineEdit" name="lineEdit_LastUsed">
+                 <property name="readOnly">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="15" column="0" colspan="2">
                 <spacer name="verticalSpacer">
                  <property name="orientation">
                   <enum>Qt::Vertical</enum>
@@ -606,17 +746,28 @@
                  </property>
                 </spacer>
                </item>
-               <item row="2" column="1">
-                <widget class="QLineEdit" name="lineEdit_GpgId">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
+               <item row="3" column="0">
+                <widget class="QLabel" name="label_GpgId">
+                 <property name="text">
+                  <string>Owner node ID :</string>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="1" rowspan="2">
+               <item row="4" column="0">
+                <widget class="QLabel" name="label_GpgName">
+                 <property name="text">
+                  <string>Owner node name :</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="12" column="0">
+                <widget class="QLabel" name="banoption_label">
+                 <property name="text">
+                  <string>Ban-option:</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="10" column="1" rowspan="2">
                 <widget class="RSComboBox" name="ownOpinion_CB">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend's positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Sans'; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -656,244 +807,202 @@
                  </item>
                 </widget>
                </item>
-               <item row="11" column="1">
-                <widget class="QLineEdit" name="overallOpinion_TF">
-                 <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends'.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <item row="0" column="2" rowspan="15">
+                <layout class="QVBoxLayout" name="verticalLayout">
+                 <property name="spacing">
+                  <number>0</number>
                  </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="3" column="0">
-                <widget class="QLabel" name="label_GpgName">
-                 <property name="text">
-                  <string>Owner node name :</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="3" column="1">
-                <widget class="QLineEdit" name="lineEdit_GpgName">
-                 <property name="enabled">
-                  <bool>true</bool>
-                 </property>
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="4" column="1">
-                <widget class="QLineEdit" name="lineEdit_PublishTS">
-                 <property name="readOnly">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="11" column="0">
-                <widget class="QLabel" name="overallOpinion_LB">
-                 <property name="font">
-                  <font>
-                   <weight>75</weight>
-                   <bold>true</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Overall:</string>
-                 </property>
-                </widget>
+                 <item>
+                  <layout class="QGridLayout" name="gridLayout_2">
+                   <item row="0" column="1">
+                    <widget class="QLabel" name="avatarLabel">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="minimumSize">
+                      <size>
+                       <width>128</width>
+                       <height>128</height>
+                      </size>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>128</width>
+                       <height>128</height>
+                      </size>
+                     </property>
+                     <property name="frameShape">
+                      <enum>QFrame::Box</enum>
+                     </property>
+                     <property name="frameShadow">
+                      <enum>QFrame::Sunken</enum>
+                     </property>
+                     <property name="text">
+                      <string extracomment="Click here to change your avatar">Your Avatar</string>
+                     </property>
+                     <property name="scaledContents">
+                      <bool>true</bool>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="2" column="1">
+                    <widget class="QPushButton" name="editButton">
+                     <property name="text">
+                      <string>Edit Identity</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="1">
+                    <widget class="QPushButton" name="inviteButton">
+                     <property name="text">
+                      <string>Send Invite</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="0" column="2" rowspan="3">
+                    <spacer name="horizontalSpacer">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeType">
+                      <enum>QSizePolicy::Minimum</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>6</width>
+                       <height>128</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                   <item row="0" column="0" rowspan="3">
+                    <spacer name="horizontalSpacer_2">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeType">
+                      <enum>QSizePolicy::Minimum</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>6</width>
+                       <height>128</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <layout class="QHBoxLayout" name="avatarOpinionHLayout">
+                   <property name="spacing">
+                    <number>6</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>2</number>
+                   </property>
+                   <item>
+                    <widget class="QLabel" name="label_PosIcon">
+                     <property name="maximumSize">
+                      <size>
+                       <width>34</width>
+                       <height>34</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="pixmap">
+                      <pixmap resource="../icons.qrc">:/icons/png/thumbs-up.png</pixmap>
+                     </property>
+                     <property name="scaledContents">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QLabel" name="label_positive">
+                     <property name="font">
+                      <font>
+                       <pointsize>16</pointsize>
+                      </font>
+                     </property>
+                     <property name="toolTip">
+                      <string>Positive votes</string>
+                     </property>
+                     <property name="text">
+                      <string>0</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="Line" name="line_Opinion">
+                     <property name="orientation">
+                      <enum>Qt::Vertical</enum>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QLabel" name="label_NegIcon">
+                     <property name="maximumSize">
+                      <size>
+                       <width>34</width>
+                       <height>34</height>
+                      </size>
+                     </property>
+                     <property name="text">
+                      <string/>
+                     </property>
+                     <property name="pixmap">
+                      <pixmap resource="../icons.qrc">:/icons/png/thumbs-down.png</pixmap>
+                     </property>
+                     <property name="scaledContents">
+                      <bool>true</bool>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QLabel" name="label_negative">
+                     <property name="font">
+                      <font>
+                       <pointsize>16</pointsize>
+                      </font>
+                     </property>
+                     <property name="toolTip">
+                      <string>Negative votes</string>
+                     </property>
+                     <property name="text">
+                      <string>0</string>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <spacer name="avatarVSpacer">
+                   <property name="orientation">
+                    <enum>Qt::Vertical</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>118</width>
+                     <height>17</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                </layout>
                </item>
               </layout>
              </widget>
             </item>
-            <item row="2" column="0" colspan="2">
-             <widget class="QFrame" name="info_Frame_Invite">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="palette">
-               <palette>
-                <active>
-                 <colorrole role="WindowText">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>0</red>
-                    <green>0</green>
-                    <blue>0</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                 <colorrole role="Base">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>255</red>
-                    <green>255</green>
-                    <blue>255</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                 <colorrole role="Window">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>255</red>
-                    <green>255</green>
-                    <blue>178</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                </active>
-                <inactive>
-                 <colorrole role="WindowText">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>0</red>
-                    <green>0</green>
-                    <blue>0</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                 <colorrole role="Base">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>255</red>
-                    <green>255</green>
-                    <blue>255</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                 <colorrole role="Window">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>255</red>
-                    <green>255</green>
-                    <blue>178</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                </inactive>
-                <disabled>
-                 <colorrole role="WindowText">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>154</red>
-                    <green>154</green>
-                    <blue>154</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                 <colorrole role="Base">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>255</red>
-                    <green>255</green>
-                    <blue>178</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                 <colorrole role="Window">
-                  <brush brushstyle="SolidPattern">
-                   <color alpha="255">
-                    <red>255</red>
-                    <green>255</green>
-                    <blue>178</blue>
-                   </color>
-                  </brush>
-                 </colorrole>
-                </disabled>
-               </palette>
-              </property>
-              <property name="autoFillBackground">
-               <bool>true</bool>
-              </property>
-              <property name="styleSheet">
-               <string notr="true"/>
-              </property>
-              <property name="frameShape">
-               <enum>QFrame::Box</enum>
-              </property>
-              <layout class="QHBoxLayout" name="info_Frame_Invite_HL">
-               <property name="leftMargin">
-                <number>6</number>
-               </property>
-               <property name="topMargin">
-                <number>6</number>
-               </property>
-               <property name="rightMargin">
-                <number>6</number>
-               </property>
-               <property name="bottomMargin">
-                <number>6</number>
-               </property>
-               <item>
-                <widget class="QLabel" name="infoPixmap_Invite">
-                 <property name="maximumSize">
-                  <size>
-                   <width>16</width>
-                   <height>16</height>
-                  </size>
-                 </property>
-                 <property name="text">
-                  <string/>
-                 </property>
-                 <property name="pixmap">
-                  <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
-                 </property>
-                 <property name="alignment">
-                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="infoLabel_Invite">
-                 <property name="text">
-                  <string notr="true">Invite messages stay into your Outbox until an acknowledgement of receipt has been received.</string>
-                 </property>
-                 <property name="wordWrap">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QToolButton" name="closeInfoFrameButton_Invite">
-                 <property name="maximumSize">
-                  <size>
-                   <width>16</width>
-                   <height>16</height>
-                  </size>
-                 </property>
-                 <property name="focusPolicy">
-                  <enum>Qt::NoFocus</enum>
-                 </property>
-                 <property name="toolTip">
-                  <string>Close</string>
-                 </property>
-                 <property name="styleSheet">
-                  <string notr="true">QToolButton
-{
- border-image: url(:/images/closenormal.png) 
-}
-                                
-QToolButton:hover 
-{
-border-image: url(:/images/closehover.png) 
-}
-                                
-QToolButton:pressed  {
-border-image: url(:/images/closepressed.png) 
-}</string>
-                 </property>
-                 <property name="autoRaise">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item row="3" column="0" colspan="2">
+            <item>
              <widget class="QGroupBox" name="usageStatisticsGBox">
               <property name="title">
                <string>Usage statistics</string>
@@ -905,7 +1014,7 @@ border-image: url(:/images/closepressed.png)
               </layout>
              </widget>
             </item>
-            <item row="4" column="0">
+            <item>
              <spacer name="scrollAreaWidgetContentsVSpacer">
               <property name="orientation">
                <enum>Qt::Vertical</enum>
@@ -919,6 +1028,9 @@ border-image: url(:/images/closepressed.png)
              </spacer>
             </item>
            </layout>
+           <zorder>detailsGroupBox</zorder>
+           <zorder>usageStatisticsGBox</zorder>
+           <zorder>headerBFramePerson</zorder>
           </widget>
          </widget>
         </item>
@@ -987,6 +1099,11 @@ border-image: url(:/images/closepressed.png)
         </item>
         <item>
          <widget class="QTreeWidget" name="treeWidget_membership">
+          <property name="font">
+           <font>
+            <pointsize>11</pointsize>
+           </font>
+          </property>
           <property name="contextMenuPolicy">
            <enum>Qt::CustomContextMenu</enum>
           </property>
@@ -1047,18 +1164,22 @@ border-image: url(:/images/closepressed.png)
   <customwidget>
    <class>LineEditClear</class>
    <extends>QLineEdit</extends>
-   <header>gui/common/LineEditClear.h</header>
+   <header location="global">gui/common/LineEditClear.h</header>
   </customwidget>
   <customwidget>
-   <class>RSComboBox</class>
-   <extends>QComboBox</extends>
-   <header>gui/common/RSComboBox.h</header>
+   <class>RSTreeWidget</class>
+   <extends>QTreeWidget</extends>
+   <header>gui/common/RSTreeWidget.h</header>
   </customwidget>
   <customwidget>
    <class>ElidedLabel</class>
    <extends>QLabel</extends>
    <header>gui/common/ElidedLabel.h</header>
-   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>RSComboBox</class>
+   <extends>QComboBox</extends>
+   <header>gui/common/RSComboBox.h</header>
   </customwidget>
   <customwidget>
    <class>RSTextBrowser</class>
@@ -1070,8 +1191,8 @@ border-image: url(:/images/closepressed.png)
   <tabstop>idTreeWidget</tabstop>
  </tabstops>
  <resources>
-  <include location="../images.qrc"/>
   <include location="../icons.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index add0de131..ac9965d2a 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -700,10 +700,10 @@ void IdEditDialog::removeAvatar()
 
 void IdEditDialog::updateInterface()
 {
-	QPixmap pixmap = ui->avatarLabel->pixmap(Qt::ReturnByValue);
-	if (!pixmap.isNull()) {
+	const QPixmap *pixmap = ui->avatarLabel->pixmap();
+	if (pixmap && !pixmap->isNull()) {
 		ui->removeButton->setEnabled(true);
-    } else if (mEditGroup.mImage.mSize > 0) {
+	} else if (mEditGroup.mImage.mSize != NULL) {
 		ui->removeButton->setEnabled(true);
 	} else {
 		ui->removeButton->setEnabled(false);
diff --git a/retroshare-gui/src/gui/Identity/IdentityListModel.cpp b/retroshare-gui/src/gui/Identity/IdentityListModel.cpp
deleted file mode 100644
index b55d9c160..000000000
--- a/retroshare-gui/src/gui/Identity/IdentityListModel.cpp
+++ /dev/null
@@ -1,968 +0,0 @@
-/*******************************************************************************
- * retroshare-gui/src/gui/msgs/RsFriendListModel.cpp                           *
- *                                                                             *
- * Copyright 2019 by Cyril Soler <csoler@users.sourceforge.net>                *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License as              *
- * published by the Free Software Foundation, either version 3 of the          *
- * License, or (at your option) any later version.                             *
- *                                                                             *
- * This program is distributed in the hope that it will be useful,             *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
- * GNU Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include <list>
-
-#include <QApplication>
-#include <QDateTime>
-#include <QFontMetrics>
-#include <QModelIndex>
-#include <QTreeView>
-#include <QPainter>
-#include <QIcon>
-
-#include "gui/common/AvatarDefs.h"
-#include "util/qtthreadsutils.h"
-#include "util/HandleRichText.h"
-#include "util/DateTime.h"
-#include "gui/gxs/GxsIdDetails.h"
-#include "retroshare/rsexpr.h"
-
-#include "IdentityListModel.h"
-
-//#define DEBUG_MODEL
-//#define DEBUG_MODEL_INDEX
-
-std::ostream& operator<<(std::ostream& o, const QModelIndex& i);// defined elsewhere
-
-const QString RsIdentityListModel::FilterString("filtered");
-
-const uint32_t MAX_INTERNAL_DATA_UPDATE_DELAY = 300 ; 	// re-update the internal data every 5 mins. Should properly cover sleep/wake-up changes.
-const uint32_t MAX_NODE_UPDATE_DELAY = 10 ; 			// re-update the internal data every 5 mins. Should properly cover sleep/wake-up changes.
-
-static const uint32_t ID_DETAILS_UPDATE_DELAY = 5;	// update each node every 5 secs.
-
-RsIdentityListModel::RsIdentityListModel(QObject *parent)
-    : QAbstractItemModel(parent)
-    , mLastInternalDataUpdate(0), mLastNodeUpdate(0)
-{
-    mFontSize = QApplication::font().pointSize();
-
-	mFilterStrings.clear();
-    mIdentityUpdateTimer = new QTimer();
-    connect(mIdentityUpdateTimer,SIGNAL(timeout()),this,SLOT(timerUpdate()));
-}
-
-void RsIdentityListModel::timerUpdate()
-{
-    emit dataChanged(index(0,0,QModelIndex()),index(2,0,QModelIndex()));
-}
-RsIdentityListModel::EntryIndex::EntryIndex()
-   : type(ENTRY_TYPE_INVALID),category_index(0),identity_index(0)
-{
-}
-
-// The index encodes the whole hierarchy of parents. This allows to very efficiently compute indices of the parent of an index.
-//
-// On 32 bits and 64 bits architectures the format is the following:
-//
-//     0x [2 bits] 00000 [24 bits] [2 bits]
-//            |              |        |
-//            |              |        +-------------- type (0=top level, 1=category, 2=identity)
-//            |              +----------------------- identity index
-//            +-------------------------------------- category index
-//
-
-bool RsIdentityListModel::convertIndexToInternalId(const EntryIndex& e,quintptr& id)
-{
-    // the internal id is set to the place in the table of items. We simply shift to allow 0 to mean something special.
-
-    if(e.type == ENTRY_TYPE_INVALID)
-    {
-        RsErr() << "ERROR: asked for the internal id of an invalid EntryIndex" ;
-        id = 0;
-        return true;
-    }
-    if(bool(e.identity_index >> 24))
-    {
-        RsErr() << "Cannot encode more than 2^24 identities. Somthing's wrong. e.identity_index = " << std::hex << e.identity_index << std::dec ;
-        id = 0;
-        return false;
-    }
-
-    id = ((0x3 & (uint32_t)e.category_index) << 30) + ((uint32_t)e.identity_index << 2) + (0x3 & (uint32_t)e.type);
-
-    return true;
-}
-bool RsIdentityListModel::convertInternalIdToIndex(quintptr ref,EntryIndex& e)
-{
-    // Compatible with ref=0 since it will cause type=TOP_LEVEL
-
-    e.type            = static_cast<RsIdentityListModel::EntryType>((ref >>  0) & 0x3) ;// 2 bits
-    e.identity_index  = (ref >>  2) & 0xffffff;// 24 bits
-    e.category_index  = (ref >> 30) & 0x3 ;// 2 bits
-
-    return true;
-}
-
-static QIcon createAvatar(const QPixmap &avatar, const QPixmap &overlay)
-{
-	int avatarWidth = avatar.width();
-	int avatarHeight = avatar.height();
-
-	QPixmap pixmap(avatar);
-
-	int overlaySize = (avatarWidth > avatarHeight) ? (avatarWidth/2.5) :  (avatarHeight/2.5);
-	int overlayX = avatarWidth - overlaySize;
-	int overlayY = avatarHeight - overlaySize;
-
-	QPainter painter(&pixmap);
-	painter.drawPixmap(overlayX, overlayY, overlaySize, overlaySize, overlay);
-
-	QIcon icon;
-	icon.addPixmap(pixmap);
-	return icon;
-}
-
-void RsIdentityListModel::preMods()
-{
-	emit layoutAboutToBeChanged();
-}
-void RsIdentityListModel::postMods()
-{
-	emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(rowCount()-1,columnCount()-1,(void*)NULL));
-	emit layoutChanged();
-}
-
-int RsIdentityListModel::rowCount(const QModelIndex& parent) const
-{
-	if(parent.column() >= COLUMN_THREAD_NB_COLUMNS)
-		return 0;
-
-    EntryIndex index;
-
-    if(!parent.isValid() || !convertInternalIdToIndex(parent.internalId(),index))
-        return mCategories.size();
-
-    switch(index.type)
-    {
-    case ENTRY_TYPE_CATEGORY: return mCategories[index.category_index].child_identity_indices.size();
-    case ENTRY_TYPE_TOP_LEVEL: return mCategories.size();
-    default:
-        return 0;
-    }
-}
-
-int RsIdentityListModel::columnCount(const QModelIndex &/*parent*/) const
-{
-	return COLUMN_THREAD_NB_COLUMNS ;
-}
-
-bool RsIdentityListModel::hasChildren(const QModelIndex &parent) const
-{
-    if(!parent.isValid())
-        return true;
-
-    EntryIndex parent_index ;
-    convertInternalIdToIndex(parent.internalId(),parent_index);
-
-    if(parent_index.type == ENTRY_TYPE_TOP_LEVEL)
-        return true;
-
-    if(parent_index.type == ENTRY_TYPE_IDENTITY)
-        return false;
-
-    if(parent_index.type == ENTRY_TYPE_CATEGORY)
-        return !mCategories[parent_index.category_index].child_identity_indices.empty();
-
-    return false;
-}
-
-RsIdentityListModel::EntryIndex RsIdentityListModel::EntryIndex::parent() const
-{
-	EntryIndex i(*this);
-
-	switch(type)
-	{
-        case ENTRY_TYPE_CATEGORY: i.type = ENTRY_TYPE_TOP_LEVEL;
-                                  i.category_index = 0;
-                                  i.identity_index = 0;
-        break;
-
-        case ENTRY_TYPE_IDENTITY: 	i.type = ENTRY_TYPE_CATEGORY;
-                                    i.identity_index = 0;
-		break;
-        case ENTRY_TYPE_TOP_LEVEL:
-                std::cerr << "ERROR: calling parent() on entryindex with no parent!" << std::endl;
-
-    default:
-			//Can be when request root index.
-		break;
-	}
-
-	return i;
-}
-
-RsIdentityListModel::EntryIndex RsIdentityListModel::EntryIndex::child(int row) const
-{
-    EntryIndex i;
-
-	switch(type)
-    {
-    case ENTRY_TYPE_TOP_LEVEL:
-                            i.type = ENTRY_TYPE_CATEGORY;
-                           i.category_index = row;
-                           i.identity_index = 0;
-
-						   break;
-
-    case ENTRY_TYPE_CATEGORY: i.type = ENTRY_TYPE_IDENTITY;
-                           i.category_index = category_index;
-                           i.identity_index = row;
-						   break;
-
-    case ENTRY_TYPE_IDENTITY:  i = EntryIndex();
-                std::cerr << "ERROR: calling child() on entryindex with no children!" << std::endl;
-    default:
-						   break;
-    }
-
-    return i;
-
-}
-uint32_t   RsIdentityListModel::EntryIndex::parentRow() const
-{
-    switch(type)
-    {
-    default:
-        case ENTRY_TYPE_TOP_LEVEL: return -1;
-        case ENTRY_TYPE_CATEGORY : return -1;
-        case ENTRY_TYPE_IDENTITY : return category_index;
-    }
-}
-
-QModelIndex RsIdentityListModel::index(int row, int column, const QModelIndex& parent) const
-{
-    if(row < 0 || column < 0 || column >= columnCount(parent) || row >= rowCount(parent))
-		return QModelIndex();
-
-    EntryIndex parent_index ;
-    convertInternalIdToIndex(parent.internalId(),parent_index);
-#ifdef DEBUG_MODEL_INDEX
-    RsDbg() << "Index row=" << row << " col=" << column << " parent=" << parent << std::endl;
-#endif
-
-    quintptr ref;
-    EntryIndex new_index = parent_index.child(row);
-    convertIndexToInternalId(new_index,ref);
-
-#ifdef DEBUG_MODEL_INDEX
-    RsDbg() << "  returning " << createIndex(row,column,ref) << std::endl;
-#endif
-
-    return createIndex(row,column,ref);
-}
-
-QModelIndex RsIdentityListModel::parent(const QModelIndex& index) const
-{
-	if(!index.isValid())
-		return QModelIndex();
-
-	EntryIndex I ;
-    convertInternalIdToIndex(index.internalId(),I);
-
-	EntryIndex p = I.parent();
-
-    if(p.type == ENTRY_TYPE_TOP_LEVEL)
-		return QModelIndex();
-
-	quintptr i;
-    convertIndexToInternalId(p,i);
-
-    return createIndex(I.parentRow(),0,i);
-}
-
-Qt::ItemFlags RsIdentityListModel::flags(const QModelIndex& index) const
-{
-	if (!index.isValid())
-		return Qt::ItemFlags();
-
-	return QAbstractItemModel::flags(index);
-}
-
-QVariant RsIdentityListModel::headerData(int section, Qt::Orientation /*orientation*/, int role) const
-{
-	if(role == Qt::DisplayRole)
-		switch(section)
-		{
-		case COLUMN_THREAD_NAME:         return tr("Name");
-		case COLUMN_THREAD_ID:           return tr("Id");
-        case COLUMN_THREAD_REPUTATION:   return QVariant();
-        case COLUMN_THREAD_OWNER_ID:     return tr("Owner Id");
-        case COLUMN_THREAD_OWNER_NAME:   return tr("Owner");
-        default:
-			return QVariant();
-		}
-    if(role == Qt::DecorationRole && section == COLUMN_THREAD_REPUTATION)
-        return QIcon(":/icons/flag-green.png");
-
-    return QVariant();
-}
-
-QVariant RsIdentityListModel::data(const QModelIndex &index, int role) const
-{
-#ifdef DEBUG_MESSAGE_MODEL
-    std::cerr << "calling data(" << index << ") role=" << role << std::endl;
-#endif
-
-	if(!index.isValid())
-		return QVariant();
-
-	quintptr ref = (index.isValid())?index.internalId():0 ;
-
-#ifdef DEBUG_MESSAGE_MODEL
-	std::cerr << "data(" << index << ")" ;
-#endif
-
-	if(!ref)
-	{
-#ifdef DEBUG_MESSAGE_MODEL
-		std::cerr << " [empty]" << std::endl;
-#endif
-		return QVariant() ;
-	}
-
-	EntryIndex entry;
-
-    if(!convertInternalIdToIndex(ref,entry))
-	{
-#ifdef DEBUG_MESSAGE_MODEL
-		std::cerr << "Bad pointer: " << (void*)ref << std::endl;
-#endif
-		return QVariant() ;
-	}
-
-	switch(role)
-	{
-	case Qt::SizeHintRole:   return sizeHintRole(entry,index.column()) ;
-	case Qt::DisplayRole:    return displayRole(entry,index.column()) ;
-	case Qt::FontRole:       return fontRole(entry,index.column()) ;
-    case Qt::ForegroundRole: return foregroundRole(entry,index.column()) ;
-    case Qt::DecorationRole: return decorationRole(entry,index.column()) ;
-
- 	case FilterRole:         return filterRole(entry,index.column()) ;
- 	case SortRole:           return sortRole(entry,index.column()) ;
-    case TreePathRole:       return treePathRole(entry,index.column()) ;
-
-	default:
-		return QVariant();
-	}
-}
-
-bool RsIdentityListModel::passesFilter(const EntryIndex& e,int /*column*/) const
-{
-	QString s ;
-
-    if(mFilterStrings.empty() || e.type != ENTRY_TYPE_IDENTITY)
-        return true;
-
-    auto passes_strings = [&](const QString& s) -> bool {
-        bool res = true;
-
-        for(auto iter(mFilterStrings.begin()); iter != mFilterStrings.end(); ++iter)
-            res = res && s.contains(*iter,Qt::CaseInsensitive);
-
-        return res;
-    };
-
-    if((mFilterType & FilterType::FILTER_TYPE_ID)         && passes_strings(displayRole(e,COLUMN_THREAD_ID        ).toString())) return true;
-    if((mFilterType & FilterType::FILTER_TYPE_NAME)       && passes_strings(displayRole(e,COLUMN_THREAD_NAME      ).toString())) return true;
-    if((mFilterType & FilterType::FILTER_TYPE_OWNER_ID)   && passes_strings(displayRole(e,COLUMN_THREAD_OWNER_ID  ).toString())) return true;
-    if((mFilterType & FilterType::FILTER_TYPE_OWNER_NAME) && passes_strings(displayRole(e,COLUMN_THREAD_OWNER_NAME).toString())) return true;
-
-    return false;
-}
-
-QVariant RsIdentityListModel::filterRole(const EntryIndex& e,int column) const
-{
-	if(passesFilter(e,column))
-		return QVariant(FilterString);
-
-	return QVariant(QString());
-}
-
-uint32_t RsIdentityListModel::updateFilterStatus(ForumModelIndex /*i*/,int /*column*/,const QStringList& /*strings*/)
-{
-	return 0;
-}
-
-
-void RsIdentityListModel::setFilter(uint8_t filter_type, const QStringList& strings)
-{
-#ifdef DEBUG_MODEL
-    std::cerr << "Setting filter to filter_type=" << int(filter_type) << " and strings to " ;
-    foreach(const QString& str,strings)
-        std::cerr << "\"" << str.toStdString() << "\" " ;
-    std::cerr << std::endl;
-#endif
-
-    preMods();
-
-    mFilterType = filter_type;
-	mFilterStrings = strings;
-
-	postMods();
-}
-
-QVariant RsIdentityListModel::toolTipRole(const EntryIndex& fmpe,int /*column*/) const
-{
-    switch(fmpe.type)
-    {
-    case ENTRY_TYPE_IDENTITY:
-    {
-        auto id_info = getIdentityInfo(fmpe);
-
-        if(!id_info)
-            return QVariant();
-
-        if(id_info->flags & RS_IDENTITY_FLAGS_IS_DEPRECATED)
-            return QVariant( tr("\nThis identity has a insecure fingerprint (It's probably quite old).\nYou should get rid of it now and use a new one.\nThese identities are not supported anymore.") ) ;
-
-        if(rsIdentity->isOwnId(id_info->id))
-            return QVariant(tr("This identity is owned by you"));
-
-        if(id_info->owner.isNull())
-            return QVariant("Anonymous identity");
-        else
-        {
-            RsPeerDetails dd;
-            if(rsPeers->getGPGDetails(id_info->owner,dd))
-                return QVariant(tr("Identity owned by profile")+" \""+ QString::fromUtf8(dd.name.c_str()) +"\" ("+QString::fromStdString(id_info->owner.toStdString()));
-            else
-                return QVariant(tr("Identity possibly owned by unknown profile")+" \""+ QString::fromUtf8(dd.name.c_str()) +"\" ("+QString::fromStdString(id_info->owner.toStdString()));
-        }
-    }
-
-        break;
-    case ENTRY_TYPE_CATEGORY: ; // fallthrough
-    default:
-        return QVariant();
-    }
-}
-
-QVariant RsIdentityListModel::sizeHintRole(const EntryIndex& e,int col) const
-{
-	float x_factor = QFontMetricsF(QApplication::font()).height()/14.0f ;
-	float y_factor = QFontMetricsF(QApplication::font()).height()/14.0f ;
-
-    if(e.type == ENTRY_TYPE_IDENTITY)
-        y_factor *= 1.0;
-
-    if(e.type == ENTRY_TYPE_CATEGORY)
-		y_factor *= 1.5;
-
-    std::cerr << "sizeHintRole()" << std::endl;
-	switch(col)
-	{
-	default:
-    case COLUMN_THREAD_REPUTATION: return QVariant( QSize(x_factor * 14 , y_factor*14*1.1f ));
-
-    case COLUMN_THREAD_NAME:
-    case COLUMN_THREAD_ID:
-    case COLUMN_THREAD_OWNER_NAME:
-    case COLUMN_THREAD_OWNER_ID:   return QFontMetricsF(QApplication::font()).boundingRect(displayRole(e,col).toString()).size();
-    }
-}
-
-QString RsIdentityListModel::indexIdentifier(QModelIndex index)
-{
-    quintptr ref = (index.isValid())?index.internalId():0 ;
-
-#ifdef DEBUG_MESSAGE_MODEL
-    std::cerr << "data(" << index << ")" ;
-#endif
-
-    if(!ref)
-    {
-#ifdef DEBUG_MESSAGE_MODEL
-        std::cerr << " [empty]" << std::endl;
-#endif
-        return QString();
-    }
-
-    EntryIndex entry;
-    if(!convertInternalIdToIndex(ref,entry))
-        return QString();
-
-    return treePathRole(entry,0).toString();
-}
-QVariant RsIdentityListModel::treePathRole(const EntryIndex& entry,int /*column*/) const
-{
-    if(entry.type == ENTRY_TYPE_CATEGORY)
-        return QString::number((int)entry.category_index);
-    else
-        return QString::fromStdString(mIdentities[mCategories[entry.category_index].child_identity_indices[entry.identity_index]].id.toStdString());
-}
-QVariant RsIdentityListModel::sortRole(const EntryIndex& entry,int column) const
-{
-    switch(column)
-    {
-    case COLUMN_THREAD_REPUTATION:  return decorationRole(entry,column);
-
-    case COLUMN_THREAD_ID:
-    case COLUMN_THREAD_OWNER_ID:
-    case COLUMN_THREAD_OWNER_NAME:
-    case COLUMN_THREAD_NAME: [[__fallthrough__]];
-    default:
-        return displayRole(entry,column);
-    }
-}
-
-QModelIndex RsIdentityListModel::getIndexOfIdentity(const RsGxsId& id) const
-{
-    for(uint i=0;i<mCategories.size();++i)
-        for(uint j=0;j<mCategories[i].child_identity_indices.size();++j)
-            if(mIdentities[mCategories[i].child_identity_indices[j]].id == id)
-            {
-                EntryIndex e;
-                e.category_index = i;
-                e.identity_index = j;
-                e.type = ENTRY_TYPE_IDENTITY;
-                quintptr idx;
-                convertIndexToInternalId(e,idx);
-
-                return createIndex(j,0,idx);
-            }
-    return QModelIndex();
-}
-
-QModelIndex RsIdentityListModel::getIndexOfCategory(Category id) const
-{
-    EntryIndex e;
-    e.category_index = id;
-    e.type = ENTRY_TYPE_CATEGORY;
-
-    quintptr idx;
-    convertIndexToInternalId(e,idx);
-
-    return createIndex((int)id,0,idx);
-}
-QVariant RsIdentityListModel::foregroundRole(const EntryIndex& e, int /*col*/) const
-{
-    auto it = getIdentityInfo(e);
-    if(!it)
-        return QVariant();
-
-    if(it->flags & RS_IDENTITY_FLAGS_IS_DEPRECATED)
-        return QVariant(QColor(Qt::red));
-
-    return QVariant();
-}
-QVariant RsIdentityListModel::fontRole(const EntryIndex& e, int /*col*/) const
-{
-    QFont f;
-    f.setPointSize(mFontSize);
-
-    auto it = getIdentityInfo(e);
-
-    if(it)
-    {
-        RsGxsId id(it->id);
-
-        if(rsIdentity->isOwnId(id))
-            f.setBold(true);
-    }
-
-    return QVariant(f);
-}
-void RsIdentityListModel::setFontSize(int s)
-{
-    if(s != mFontSize)
-    {
-        mFontSize = s;
-        emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mCategories.size()-1,columnCount()-1,(void*)NULL));
-    }
-}
-
-#ifdef DEBUG_MODEL_INDEX
-	std::cerr << "  font role " << e.type << ", (" << (int)e.group_index << ","<< (int)e.profile_index << ","<< (int)e.node_index << ") col="<< col<<": " << std::endl;
-#endif
-
-#ifdef TODO
-	int status = onlineRole(e,col).toInt();
-
-	switch (status)
-	{
-		case RS_STATUS_INACTIVE:
-		{
-			QFont font ;
-			QTreeView* myParent = dynamic_cast<QTreeView*>(QAbstractItemModel::parent());
-			if (myParent)
-				font = myParent->font();
-
-			font.setBold(true);
-
-			return QVariant(font);
-		}
-		default:
-		return QVariant();
-	}
-#endif
-
-QVariant RsIdentityListModel::displayRole(const EntryIndex& e, int col) const
-{
-#ifdef DEBUG_MODEL_INDEX
-	std::cerr << "  Display role " << e.type << ", (" << (int)e.group_index << ","<< (int)e.profile_index << ","<< (int)e.node_index << ") col="<< col<<": ";
-#endif
-
-	switch(e.type)
-	{
-        case ENTRY_TYPE_CATEGORY:
-		{
-            const HierarchicalCategoryInformation *cat = getCategoryInfo(e);
-
-            if(!cat)
-				return QVariant();
-
-			switch(col)
-			{
-				case COLUMN_THREAD_NAME:
-#ifdef DEBUG_MODEL_INDEX
-					std::cerr <<   group->group_info.name.c_str() ;
-#endif
-
-                    if(!cat->child_identity_indices.empty())
-                        return QVariant(cat->category_name+" (" + QString::number(cat->child_identity_indices.size()) + ")");
-					else
-                        return QVariant(cat->category_name);
-
-				default:
-				return QVariant();
-			}
-		}
-		break;
-
-        case ENTRY_TYPE_IDENTITY:
-        {
-                const HierarchicalIdentityInformation *idinfo = getIdentityInfo(e);
-                const QString loading_string = "["+tr("Loading...")+"]";
-
-#ifdef DEBUG_MODEL_INDEX
-                std::cerr << profile->profile_info.name.c_str() ;
-#endif
-                if(col == COLUMN_THREAD_ID) return QVariant(QString::fromStdString(idinfo->id.toStdString()) );
-                if(col == COLUMN_THREAD_REPUTATION) return QVariant();
-
-                if(idinfo->nickname.empty())
-                    return loading_string;
-
-                switch(col)
-                {
-                case COLUMN_THREAD_NAME:           return QVariant(QString::fromUtf8(idinfo->nickname.c_str()));
-                case COLUMN_THREAD_OWNER_NAME:     if(idinfo->owner.isNull())
-                                                        return QVariant();
-                                                    else
-                                                        return QVariant(QString::fromStdString(rsPeers->getGPGName(idinfo->owner)) );
-
-                case COLUMN_THREAD_OWNER_ID:       if(idinfo->owner.isNull())
-                                                        return QVariant();
-                                                    else
-                                                        return QVariant(QString::fromStdString(idinfo->owner.toStdString()) );
-                default:
-                        return QVariant();
-                }
-        }
-		break;
-
-		default: //ENTRY_TYPE
-		return QVariant();
-	}
-}
-
-// This function makes sure that the internal data gets updated. They are situations where the notification system cannot
-// send the information about changes, such as when the computer is put on sleep.
-
-void RsIdentityListModel::checkInternalData(bool force)
-{
-	rstime_t now = time(NULL);
-
-    if( (mLastInternalDataUpdate + MAX_INTERNAL_DATA_UPDATE_DELAY < now) || force)
-        updateIdentityList();
-}
-
-const RsIdentityListModel::HierarchicalCategoryInformation *RsIdentityListModel::getCategoryInfo(const EntryIndex& e) const
-{
-    if(e.category_index >= mCategories.size())
-        return NULL ;
-    else
-        return &mCategories[e.category_index];
-}
-
-const RsIdentityListModel::HierarchicalIdentityInformation *RsIdentityListModel::getIdentityInfo(const EntryIndex& e) const
-{
-    // First look into the relevant group, then for the correct profile in this group.
-
-    if(e.type != ENTRY_TYPE_IDENTITY)
-        return nullptr ;
-
-    if(e.category_index >= mCategories.size())
-        return nullptr ;
-
-    if(e.identity_index < mCategories[e.category_index].child_identity_indices.size())
-    {
-        auto& it(mIdentities[mCategories[e.category_index].child_identity_indices[e.identity_index]]);
-        rstime_t now = time(nullptr);
-
-        if(now > it.last_update_TS + ID_DETAILS_UPDATE_DELAY)
-        {
-            RsIdentityDetails det;
-            if(rsIdentity->getIdDetails(it.id,det))
-            {
-                it.nickname = det.mNickname;
-                it.owner = det.mPgpId;
-                it.flags = det.mFlags;
-                it.last_update_TS = now;
-            }
-        }
-        return &it;
-    }
-    else
-    {
-        RsErr() << "Inconsistent identity index!" ;
-        return nullptr;
-    }
-}
-
-QVariant RsIdentityListModel::decorationRole(const EntryIndex& entry,int col) const
-{
-    switch(entry.type)
-    {
-    case ENTRY_TYPE_CATEGORY:
-        return QVariant();
-
-    case ENTRY_TYPE_IDENTITY:
-    {
-        const HierarchicalIdentityInformation *hn = getIdentityInfo(entry);
-
-        if(!hn)
-            return QVariant();
-
-        if(col == COLUMN_THREAD_REPUTATION)
-            return QVariant( static_cast<uint8_t>(rsReputations->overallReputationLevel(hn->id)) );
-        else if(col == COLUMN_THREAD_NAME)
-        {
-            QPixmap sslAvatar;
-            RsIdentityDetails details ;
-
-            if(!rsIdentity->getIdDetails(hn->id, details))
-            {
-                mIdentityUpdateTimer->stop();
-                mIdentityUpdateTimer->setSingleShot(true);
-                mIdentityUpdateTimer->start(500);
-                return QVariant();
-            }
-            else if(details.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(details.mAvatar.mData, details.mAvatar.mSize, sslAvatar,GxsIdDetails::LARGE))
-                return QVariant(QIcon(GxsIdDetails::makeDefaultIcon(hn->id,GxsIdDetails::SMALL)));
-            else
-                return QVariant(QIcon(sslAvatar));
-        }
-        else
-            return QVariant();
-    }
-        break;
-
-    default:
-        return QVariant();
-    }
-}
-
-void RsIdentityListModel::clear()
-{
-    preMods();
-
-    mIdentities.clear();
-    mCategories.clear();
-
-    mCategories.resize(3);
-    mCategories[0].category_name = tr("My own identities");
-    mCategories[1].category_name = tr("My contacts");
-    mCategories[2].category_name = tr("All");
-
-	postMods();
-
-	emit friendListChanged();
-}
-
-
-void RsIdentityListModel::debug_dump() const
-{
-    std::cerr << "==== IdentityListModel Debug dump ====" << std::endl;
-
-    std::cerr << "Invalid index  : " << QModelIndex() << std::endl;
-
-    EntryIndex top_level;
-    top_level.type = ENTRY_TYPE_TOP_LEVEL;
-    quintptr id;
-    convertIndexToInternalId(top_level,id);
-
-    std::cerr << "Top level index: " << createIndex(0,0,id) << std::endl;
-    EntryIndex tei;
-    convertInternalIdToIndex(0,tei);
-    std::cerr << "Top level entry index: " << tei << std::endl;
-
-    for(uint32_t j=0;j<mCategories.size();++j)
-    {
-        std::cerr << mCategories[j].category_name.toStdString() << " (" << mCategories[j].child_identity_indices.size() << ")" << std::endl;
-        const auto& hg(mCategories[j].child_identity_indices);
-
-        for(uint32_t i=0;i<hg.size();++i)
-        {
-            auto idx = getIndexOfIdentity(mIdentities[hg[i]].id);
-            auto parent = idx.parent();
-            EntryIndex index;
-            EntryIndex index_parent;
-            convertInternalIdToIndex(idx.internalId(),index);
-            convertInternalIdToIndex(parent.internalId(),index_parent);
-            std::cerr << "       " << mIdentities[hg[i]].id << " index = " << idx << " parent = " << idx.parent() << " EntryIndex: " << index << " Parent index: " << index_parent << std::endl;
-        }
-    }
-
-    std::cerr << "====================================" << std::endl;
-}
-
-
-RsGxsId RsIdentityListModel::getIdentity(const QModelIndex& i) const
-{
-    if(!i.isValid())
-        return RsGxsId();
-
-    EntryIndex e;
-    if(!convertInternalIdToIndex(i.internalId(),e) || e.type != ENTRY_TYPE_IDENTITY)
-        return RsGxsId();
-
-    const HierarchicalIdentityInformation *gnode = getIdentityInfo(e);
-
-    if(gnode)
-        return gnode->id;
-    else
-        return RsGxsId();
-}
-
-RsIdentityListModel::EntryType RsIdentityListModel::getType(const QModelIndex& i) const
-{
-	if(!i.isValid())
-        return ENTRY_TYPE_TOP_LEVEL;
-
-	EntryIndex e;
-    if(!convertInternalIdToIndex(i.internalId(),e))
-        return ENTRY_TYPE_TOP_LEVEL;
-
-    return e.type;
-}
-
-int RsIdentityListModel::getCategory(const QModelIndex& i) const
-{
-    if(!i.isValid())
-        return CATEGORY_ALL;
-
-    EntryIndex e;
-    if(!convertInternalIdToIndex(i.internalId(),e))
-        return CATEGORY_ALL;
-
-    return e.category_index;
-}
-void RsIdentityListModel::setIdentities(const std::list<RsGroupMetaData>& identities_meta)
-{
-    preMods();
-    beginResetModel();
-    clear();
-
-    for(auto id:identities_meta)
-    {
-        HierarchicalIdentityInformation idinfo;
-        idinfo.id = RsGxsId(id.mGroupId);
-        idinfo.last_update_TS = 0;// forces update
-
-        if(rsIdentity->isOwnId(idinfo.id))
-            mCategories[CATEGORY_OWN].child_identity_indices.push_back(mIdentities.size());
-        else if(rsIdentity->isARegularContact(RsGxsId(id.mGroupId)))
-            mCategories[CATEGORY_CTS].child_identity_indices.push_back(mIdentities.size());
-        else
-            mCategories[CATEGORY_ALL].child_identity_indices.push_back(mIdentities.size());
-
-        mIdentities.push_back(idinfo);
-    }
-
-    if (mCategories.size()>0)
-    {
-        beginInsertRows(QModelIndex(),0,mCategories.size()-1);
-        endInsertRows();
-    }
-
-    endResetModel();
-    postMods();
-
-    mLastInternalDataUpdate = time(NULL);
-
-}
-
-void RsIdentityListModel::updateIdentityList()
-{
-    std::cerr << "Updating identity list" << std::endl;
-
-    std::list<RsGroupMetaData> ids ;
-
-    if(!rsIdentity->getIdentitiesSummaries(ids))
-    {
-        std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve identity metadata." << std::endl;
-        return;
-    }
-
-    setIdentities(ids) ;
-
-    debug_dump();
-}
-
-
-
-void RsIdentityListModel::collapseItem(const QModelIndex& index)
-{
-    if(getType(index) != ENTRY_TYPE_CATEGORY)
-        return;
-
-    EntryIndex entry;
-
-    if(!convertInternalIdToIndex(index.internalId(),entry))
-        return;
-
-    mExpandedCategories[entry.category_index] = false;
-
-    // apparently we cannot be subtle here.
-    emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mCategories.size()-1,columnCount()-1,(void*)NULL));
-}
-
-void RsIdentityListModel::expandItem(const QModelIndex& index)
-{
-    if(getType(index) != ENTRY_TYPE_CATEGORY)
-        return;
-
-    EntryIndex entry;
-
-    if(!convertInternalIdToIndex(index.internalId(),entry))
-        return;
-
-    mExpandedCategories[entry.category_index] = true;
-
-    // apparently we cannot be subtle here.
-    emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mCategories.size()-1,columnCount()-1,(void*)NULL));
-}
-
-
-
diff --git a/retroshare-gui/src/gui/Identity/IdentityListModel.h b/retroshare-gui/src/gui/Identity/IdentityListModel.h
deleted file mode 100644
index 4c3cb43e2..000000000
--- a/retroshare-gui/src/gui/Identity/IdentityListModel.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * retroshare-gui/src/gui/msgs/RsFriendListModel.h                             *
- *                                                                             *
- * Copyright 2019 by Cyril Soler <csoler@users.sourceforge.net>                *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License as              *
- * published by the Free Software Foundation, either version 3 of the          *
- * License, or (at your option) any later version.                             *
- *                                                                             *
- * This program is distributed in the hope that it will be useful,             *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
- * GNU Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#pragma once
-
-#include <QModelIndex>
-#include <QColor>
-
-#include "retroshare/rsstatus.h"
-#include "retroshare/rsmsgs.h"
-#include "retroshare/rspeers.h"
-#include "retroshare/rsidentity.h"
-
-typedef uint32_t ForumModelIndex;
-
-// This class is the item model used by Qt to display the information
-
-class QTimer;
-
-class RsIdentityListModel : public QAbstractItemModel
-{
-	Q_OBJECT
-
-public:
-    explicit RsIdentityListModel(QObject *parent = NULL);
-    ~RsIdentityListModel(){}
-
-    enum Columns {
-		COLUMN_THREAD_NAME         = 0x00,
-        COLUMN_THREAD_ID           = 0x01,
-        COLUMN_THREAD_OWNER_NAME   = 0x02,
-        COLUMN_THREAD_OWNER_ID     = 0x03,
-        COLUMN_THREAD_REPUTATION   = 0x04,
-        COLUMN_THREAD_NB_COLUMNS   = 0x05
-	};
-
-	enum Roles{ SortRole           = Qt::UserRole+1,
-              	StatusRole         = Qt::UserRole+2,
-              	UnreadRole         = Qt::UserRole+3,
-              	FilterRole         = Qt::UserRole+4,
-                TreePathRole       = Qt::UserRole+5,
-              };
-
-    enum FilterType{ FILTER_TYPE_NONE       = 0x00,
-                     FILTER_TYPE_ID         = 0x01,
-                     FILTER_TYPE_NAME       = 0x02,
-                     FILTER_TYPE_OWNER_NAME = 0x04,
-                     FILTER_TYPE_OWNER_ID   = 0x08
-                   };
-
-    enum EntryType{ ENTRY_TYPE_TOP_LEVEL = 0x00,
-                    ENTRY_TYPE_CATEGORY  = 0x01,
-                    ENTRY_TYPE_IDENTITY  = 0x02,
-                    ENTRY_TYPE_INVALID   = 0x03
-                  };
-
-    enum Category{ 	CATEGORY_OWN = 0x00,
-                    CATEGORY_CTS = 0x01,
-                    CATEGORY_ALL = 0x02
-                 };
-
-    struct HierarchicalCategoryInformation
-    {
-        QString category_name;
-        std::vector<uint32_t> child_identity_indices;	// index in the array of hierarchical profiles
-    };
-
-    // This stores all the info that is useful avoiding a call to the more expensive getIdDetails()
-    //
-    struct HierarchicalIdentityInformation
-    {
-        rstime_t last_update_TS;
-        RsGxsId id;
-        RsPgpId owner;
-        uint32_t flags;
-        std::string nickname;
-    };
-
-    // This structure encodes the position of a node in the hierarchy. The type tells which of the index fields are valid.
-
-    struct EntryIndex
-    {
-    public:
-        EntryIndex();
-
-        EntryType type;		        // type of the entry (group,profile,location)
-
-        friend std::ostream& operator<<(std::ostream& o, const EntryIndex& e)
-        {
-            o << "[" ;
-            switch(e.type)
-            {
-            case RsIdentityListModel::ENTRY_TYPE_INVALID: o << "Invalid," ; break;
-            case RsIdentityListModel::ENTRY_TYPE_CATEGORY: o << "Category," ; break;
-            case RsIdentityListModel::ENTRY_TYPE_IDENTITY: o << "Identity," ; break;
-            case RsIdentityListModel::ENTRY_TYPE_TOP_LEVEL: o << "Toplevel," ; break;
-            }
-            o << " CI: " << e.category_index << ", ";
-            o << " II: " << e.identity_index << "]";
-            return o;
-        }
-
-        // Indices w.r.t. parent. The set of indices entirely determines the position of the entry in the hierarchy.
-        // An index of 0xff means "undefined"
-
-        uint16_t category_index;	// index of the category in the mCategory array
-        uint16_t identity_index;	// index of the identity in its own category
-
-        EntryIndex parent() const;
-        EntryIndex child(int row) const;
-        uint32_t   parentRow() const;
-    };
-
-	QModelIndex root() const{ return createIndex(0,0,(void*)NULL) ;}
-    QModelIndex getIndexOfIdentity(const RsGxsId& id) const;
-    QModelIndex getIndexOfCategory(Category id) const;
-
-    void updateIdentityList();
-
-    int count() const { return mIdentities.size() ; }	// total number of identities
-
-    static const QString FilterString ;
-
-    // This method will asynchroneously update the data
-
-    EntryType getType(const QModelIndex&) const;
-    RsGxsId getIdentity(const QModelIndex&) const;
-    int getCategory(const QModelIndex&) const;
-    void setFontSize(int s);
-
-    void setFilter(uint8_t filter_type, const QStringList& strings) ;
-
-    void expandItem(const QModelIndex&) ;
-    void collapseItem(const QModelIndex&) ;
-
-    // Overloaded methods from QAbstractItemModel
-
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-    bool hasChildren(const QModelIndex &parent = QModelIndex()) const override;
-
-    QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex& child) const override;
-    Qt::ItemFlags flags(const QModelIndex& index) const  override;
-
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
-	void clear() ;
-    QString indexIdentifier(QModelIndex i);
-
-	/* Color definitions (for standard see default.qss) */
-	QColor mTextColorGroup;
-	QColor mTextColorStatus[RS_STATUS_COUNT];
-
-    void setIdentities(const std::list<RsGroupMetaData>& identities_meta);
-
-private:
-    const HierarchicalCategoryInformation    *getCategoryInfo  (const EntryIndex&) const;
-    const HierarchicalIdentityInformation    *getIdentityInfo(const EntryIndex&) const;
-
-    void checkIdentity(HierarchicalIdentityInformation& node);
-
-    QVariant sizeHintRole  (const EntryIndex& e, int col) const;
-	QVariant displayRole   (const EntryIndex& e, int col) const;
-	QVariant decorationRole(const EntryIndex& e, int col) const;
-	QVariant toolTipRole   (const EntryIndex& e, int col) const;
-	QVariant statusRole    (const EntryIndex& e, int col) const;
-	QVariant sortRole      (const EntryIndex& e, int col) const;
-	QVariant fontRole      (const EntryIndex& e, int col) const;
-    QVariant foregroundRole(const EntryIndex& e, int col) const;
-    QVariant textColorRole (const EntryIndex& e, int col) const;
-	QVariant filterRole    (const EntryIndex& e, int col) const;
-    QVariant treePathRole  (const EntryIndex& entry,int column) const;
-
-    /*!
-     * \brief debug_dump
-     * 			Dumps the hierarchy of posts in the terminal, to allow checking whether the internal representation is correct.
-     */
-
-public slots:
-	void checkInternalData(bool force);
-    void debug_dump() const;
-    void timerUpdate();
-
-signals:
-    void dataLoaded();	// emitted after the messages have been set. Can be used to updated the UI.
-    void friendListChanged();	// emitted after the messages have been set. Can be used to updated the UI.
-    void dataAboutToLoad();
-
-private:
-    bool passesFilter(const EntryIndex &e, int column) const;
-
-	void preMods() ;
-	void postMods() ;
-
-    void *getParentRef(void *ref,int& row) const;
-    void *getChildRef(void *ref,int row) const;
-    int  getChildrenCount(void *ref) const;
-
-    static bool convertIndexToInternalId(const EntryIndex& e,quintptr& ref);
-    static bool convertInternalIdToIndex(quintptr ref, EntryIndex& e);
-
-	uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings);
-
-    QStringList mFilterStrings;
-    uint8_t  mFilterType;
-    int mFontSize;
-
-    rstime_t mLastInternalDataUpdate;
-    rstime_t mLastNodeUpdate;;
-
-    // The 3 vectors below store thehierarchical information for groups, profiles and locations,
-    // meaning which is the child/parent of which. The actual group/profile/node data are also stored in the
-    // structure.
-
-    mutable std::vector<HierarchicalCategoryInformation>   mCategories;
-    mutable std::vector<HierarchicalIdentityInformation>   mIdentities;
-
-    // The top level list contains all nodes to display, which type depends on the option to display groups or not.
-    // Idices in the list may be profile indices or group indices. In the former case the profile child index refers to
-    // the inde in the mProfiles tab, whereas in the the later case, the child index refers to the index of the profile in the
-    // group it belows to.
-
-    std::vector<EntryIndex> mTopLevel;
-
-    // keeps track of expanded/collapsed items, so as to only show icon for collapsed profiles
-
-    std::vector<bool> mExpandedCategories;
-
-    // List of identities for which getIdDetails() failed, to be requested again.
-    mutable QTimer *mIdentityUpdateTimer;
-};
-
-
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 5ba8f1ddd..a59d76dfb 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -28,16 +28,9 @@
 #include <QString>
 #include <QUrl>
 #include <QtDebug>
-#include <QMenuBar>
-#include <QActionGroup>
 
 #include <retroshare/rsplugin.h>
 #include <retroshare/rsconfig.h>
-#include <util/argstream.h>
-
-#if defined(Q_OS_DARWIN)
-#include "gui/common/MacDockIconHandler.h"
-#endif
 
 #ifdef MESSENGER_WINDOW
 #include "MessengerWindow.h"
@@ -121,7 +114,7 @@
 #include "gui/statistics/StatisticsWindow.h"
 
 #include "gui/connect/ConnectFriendWizard.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "settings/rsettingswin.h"
 #include "settings/rsharesettings.h"
 #include "common/StatusDefs.h"
@@ -213,7 +206,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
             hiddenmode = true;
     }
 
-    setWindowTitle(tr("RetroShare %1 a secure decentralized communication platform").arg(RsApplication::retroshareVersion(true)) + " - " + nameAndLocation);
+    setWindowTitle(tr("RetroShare %1 a secure decentralized communication platform").arg(Rshare::retroshareVersion(true)) + " - " + nameAndLocation);
     connect(rApp, SIGNAL(newArgsReceived(QStringList)), this, SLOT(receiveNewArgs(QStringList)));
 
     /* add url handler for RetroShare links */
@@ -361,8 +354,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
 
     connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
     settingsChanged();
-
-    mFontSizeHandler.registerFontSize(ui->listWidget, 1.5f);
 }
 
 /** Destructor. */
@@ -386,11 +377,6 @@ MainWindow::~MainWindow()
     delete sysTrayStatus;
     delete trayIcon;
     delete trayMenu;
-#if defined(Q_OS_DARWIN)
-    delete menuBar;
-    delete dockMenu;
-    MacDockIconHandler::cleanup();
-#endif
 //  delete notifyMenu; // already deleted by the deletion of trayMenu
     StatisticsWindow::releaseInstance();
 
@@ -567,11 +553,6 @@ void MainWindow::addPage(MainPage *page, QActionGroup *grp, QList<QPair<MainPage
 	QListWidgetItem *item = new QListWidgetItem(QIcon(page->iconPixmap()),page->pageName()) ;
 	ui->listWidget->addItem(item) ;
 
-#if defined(Q_OS_DARWIN)
-    QFont f = ui->toolBarPage->font();
-    action->setFont(f);
-#endif
-
 	if (notify)
 	{
 		QPair<QAction*, QListWidgetItem*> pair = QPair<QAction*, QListWidgetItem*>( action, item);
@@ -670,75 +651,10 @@ void MainWindow::createTrayIcon()
     trayIcon->setContextMenu(trayMenu);
     trayIcon->setIcon(QIcon(IMAGE_NOONLINE));
 
-#if defined(Q_OS_DARWIN)
-    // Note: On macOS, the Dock icon is used to provide the tray's functionality.
-    MacDockIconHandler* dockIconHandler = MacDockIconHandler::instance();
-    connect(dockIconHandler, &MacDockIconHandler::dockIconClicked, [this] {
-        show();
-        activateWindow();
-    });
-#endif
-
-#if defined(Q_OS_DARWIN)
-    createMenuBar();
-#endif
-
     connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleVisibility(QSystemTrayIcon::ActivationReason)));
     trayIcon->show();
 }
 
-#if defined(Q_OS_DARWIN)
-/** Creates a new menubar for macOS */
-void MainWindow::createMenuBar()
-{
-    /* Mac users sure like their shortcuts. */
-    actionMinimize = new QAction(tr("Minimize"),this);
-    actionMinimize->setShortcutContext(Qt::ApplicationShortcut);
-    actionMinimize->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M));
-    actionMinimize->setShortcutVisibleInContextMenu(true);
-    connect(actionMinimize,SIGNAL(triggered()),this,SLOT(minimizeWindow())) ; 
-
-    actionCloseWindow = new QAction(tr("Close window"),this);
-    actionCloseWindow->setShortcutContext(Qt::ApplicationShortcut);
-    actionCloseWindow->setShortcut(QKeySequence::Close);
-    actionCloseWindow->setShortcutVisibleInContextMenu(true);
-    connect(actionCloseWindow,SIGNAL(triggered()),this,SLOT(closeWindow())) ;
-
-    menuBar = new QMenuBar(this);
-    QMenu *fileMenu = menuBar->addMenu("");
-    fileMenu->addAction(actionMinimize);
-    fileMenu->addAction(actionCloseWindow);
-
-    dockMenu = new QMenu(this);
-    dockMenu->setAsDockMenu();
-    dockMenu->addAction(tr("Open Messages"), this, SLOT(showMess()));
-    dockMenu->addAction(tr("Bandwidth Graph"), this, SLOT(showBandwidthGraph()));
-    dockMenu->addAction(tr("Statistics"), this, SLOT(showStatisticsWindow()));
-    dockMenu->addAction(tr("Options"), this, SLOT(showSettings()));
-    dockMenu->addAction(tr("Help"), this, SLOT(showHelpDialog()));
-
-    dockMenu->addSeparator();
-    QMenu *statusMenu = dockMenu->addMenu(tr("Status"));
-    initializeStatusObject(statusMenu, true);
-
-}
-#endif
-
-#if defined(Q_OS_DARWIN)
-void MainWindow::minimizeWindow()
-{
-    setWindowState(windowState() | Qt::WindowMinimized);
-}
-#endif
-
-#if defined(Q_OS_DARWIN)
-void MainWindow::closeWindow()
-{
-    // On macOS window close is basically equivalent to window hide.
-    close();
-}
-#endif
-
 void MainWindow::showBandwidthGraph()
 {
 	if(_bandwidthGraph == NULL)
@@ -1030,7 +946,6 @@ void SetForegroundWindowInternal(HWND hWnd)
 
     /* Show the dialog. */
     raiseWindow();
-
     /* Set the focus to the specified page. */
     _instance->ui->stackPages->setCurrentPage(page);
 }
@@ -1263,91 +1178,10 @@ void MainWindow::doQuit()
 	rApp->quit();
 }
 
-// This method parses arguments passed by the operating system. All arguments
-// except -r, -f, -o and lists of rscollection files and rslinks are discarded.
-//
 void MainWindow::receiveNewArgs(QStringList args)
 {
-    RsInfo() << "Received new arguments from operating system call.";
-
-    std::string argstring = RsApplication::applicationFilePath().toStdString() ;
-
-    for(auto l:args)
-        argstring += " " + l.toStdString();
-
-    // This class does all the job at once: validate arguments, and parses them.
-
-    std::vector<std::string> links_and_files;
-
-    argstream as(argstring.c_str());
-
-    QString omValues = QString(";full;noturtle;gaming;minimal;");
-    std::string opModeStr;
-    std::string retroshare_link_url;
-    std::string rscollection_file;
-
-    as  >> parameter('r',"rslink",retroshare_link_url,"Retroshare:// link","Retroshare link to open in Downloads " ,false)
-        >> parameter('f',"rsfile",rscollection_file,"file","File to open " ,false)
-        >> parameter('o',"opmode",opModeStr,"opmode","Set mode (Full, NoTurtle, Gaming, Minimal) " ,false)
-        >> values<std::string>(back_inserter(links_and_files),"links and files");
-
-    if(!as.isOk())
-    {
-        RsErr() << "Error while parsing arguments:" ;
-        RsErr() << as.errorLog() ;
-        return;
-    }
-    if(!opModeStr.empty() && omValues.contains(";"+QString::fromStdString(opModeStr).toLower()+";"))
-    {
-        QString opmode = QString::fromStdString(opModeStr).toLower();
-        //RsApplication::setOpMode(opModeStr.toLower()); // Do we need this??
-
-        RsInfo() << "Setting new operating mode to \"" << opmode.toStdString() << "\"";
-
-        if (opmode == "noturtle")
-            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE) - 1);
-        else if (opmode == "gaming")
-            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::GAMING) - 1);
-        else if (opmode == "minimal")
-            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::MINIMAL) - 1);
-        else if (opmode != "")
-            opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::FULL) - 1);
-
-        opModeStatus->setOpMode();
-    }
-
-    // Sort all collected arguments into rscollection files and retroshare links, accordingly
-
-    QStringList rscollection_files;
-    QList<RetroShareLink> rslinks;
-
-    auto sort = [&](const QString s) {
-
-        if(QFile(s).exists() && s.endsWith(".rscollection"))
-            rscollection_files.append(QString::fromUtf8(rscollection_file.c_str()));
-        else if(s.startsWith("retroshare://"))
-        {
-            RetroShareLink link(s);
-
-            if(link.valid())
-                rslinks.push_back(link);
-        }
-    };
-
-    sort(QString::fromUtf8(rscollection_file.c_str()));
-    sort(QString::fromUtf8(retroshare_link_url.c_str()));
-
-    for(auto s:links_and_files)
-        sort(QString::fromUtf8(s.c_str()));
-
-    // Now handle links and rscollection files.
-
-    for(auto file:rscollection_files)
-        if(file.endsWith(".rscollection"))
-            openRsCollection(file);
-
-    for(auto link:rslinks)
-        retroshareLinkActivated(link.toUrl());
+	Rshare::parseArguments(args, false);
+	processLastArgs();
 }
 
 void MainWindow::displayErrorMessage(int /*a*/,int /*b*/,const QString& error_msg)
@@ -1386,11 +1220,7 @@ void MainWindow::updateMenu()
 
 void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e)
 {
-#if defined(Q_OS_DARWIN)
-    if (e == QSystemTrayIcon::DoubleClick) {
-#else
     if (e == QSystemTrayIcon::Trigger || e == QSystemTrayIcon::DoubleClick) {
-#endif
         if (isHidden() || isMinimized()) {
             show();
             if (isMinimized()) {
@@ -1714,9 +1544,45 @@ void MainWindow::retroshareLinkActivated(const QUrl &url)
 void MainWindow::openRsCollection(const QString &filename)
 {
 	QFileInfo qinfo(filename);
+	if (qinfo.exists()) {
+		if (qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString)) {
+			RsCollection collection;
+			collection.openColl(qinfo.absoluteFilePath());
+		}
+	}
+}
+
+void MainWindow::processLastArgs()
+{
+	while (!Rshare::links()->isEmpty()) {
+		std::cerr << "MainWindow::processLastArgs() : " << Rshare::links()->count() << std::endl;
+		/* Now use links from the command line, because no RetroShare was running */
+		RetroShareLink link(Rshare::links()->takeFirst());
+		if (link.valid()) {
+			retroshareLinkActivated(link.toUrl());
+		}
+	}
+	while (!Rshare::files()->isEmpty()) {
+		/* Now use files from the command line, because no RetroShare was running */
+		openRsCollection(Rshare::files()->takeFirst());
+	}
+	/* Handle the -opmode options. */
+	if (opModeStatus) {
+		QString opmode = Rshare::opmode().toLower();
+		if (opmode == "noturtle") {
+			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::NOTURTLE) - 1);
+		} else if (opmode == "gaming") {
+			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::GAMING) - 1);
+		} else if (opmode == "minimal") {
+			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::MINIMAL) - 1);
+		} else if (opmode != "") {
+			opModeStatus->setCurrentIndex(static_cast<typename std::underlying_type<RsOpMode>::type>(RsOpMode::FULL) - 1);
+		}
+		opModeStatus->setOpMode();
+	} else {
+		std::cerr << "ERR: MainWindow::processLastArgs opModeStatus is not initialized.";
+	}
 
-    if (qinfo.exists() && qinfo.absoluteFilePath().endsWith(RsCollection::ExtensionString))
-            RsCollectionDialog::openExistingCollection(qinfo.absoluteFilePath());
 }
 
 void MainWindow::switchVisibilityStatus(StatusElement e,bool b)
diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h
index b435524f0..bac210f2c 100644
--- a/retroshare-gui/src/gui/MainWindow.h
+++ b/retroshare-gui/src/gui/MainWindow.h
@@ -27,7 +27,6 @@
 
 #include "gui/common/rwindow.h"
 #include "gui/common/RSComboBox.h"
-#include "util/FontSizeHandler.h"
 
 namespace Ui {
 class MainWindow;
@@ -215,6 +214,7 @@ public slots:
     void externalLinkActivated(const QUrl &url);
     void retroshareLinkActivated(const QUrl &url);
     void openRsCollection(const QString &filename);
+    void processLastArgs();
     //! Go to a specific part of the control panel.
     void setNewPage(int page);
     void setCompactStatusMode(bool compact);
@@ -265,11 +265,6 @@ private slots:
     void toggleVisibility(QSystemTrayIcon::ActivationReason e);
     void toggleVisibilitycontextmenu();
 
-#if defined(Q_OS_DARWIN)
-    void minimizeWindow();
-    void closeWindow();
-#endif
-
     /** Toolbar fns. */
     void addFriend();
     //void newRsCollection();
@@ -313,10 +308,6 @@ private:
     void initStackedPage();
     void addPage(MainPage *page, QActionGroup *grp, 	QList<QPair<MainPage *, QPair<QAction *, QListWidgetItem *> > > *notify);
     void createTrayIcon();
-#if defined(Q_OS_DARWIN)
-    /** Creates a default menubar on Mac */
-    void createMenuBar();
-#endif
     void createNotifyIcons();
     static MainWindow *_instance;
 
@@ -333,14 +324,6 @@ private:
 
     QString nameAndLocation;
 
-#if defined(Q_OS_DARWIN)
-    /** The menubar (Mac OS X only). */
-    QMenuBar *menuBar;
-    QMenu *dockMenu;
-    QAction* actionMinimize;
-    QAction* actionCloseWindow;
-#endif
-
     QSystemTrayIcon *trayIcon;
     QMenu *notifyMenu;
     QMenu *trayMenu;
@@ -372,8 +355,6 @@ private:
     void setIdle(bool Idle);
     bool isIdle;
 
-    FontSizeHandler mFontSizeHandler;
-
 	 Ui::MainWindow *ui ;
 };
 
diff --git a/retroshare-gui/src/gui/MainWindow.ui b/retroshare-gui/src/gui/MainWindow.ui
index 796593dfd..55a7145e0 100644
--- a/retroshare-gui/src/gui/MainWindow.ui
+++ b/retroshare-gui/src/gui/MainWindow.ui
@@ -33,6 +33,11 @@
          <height>0</height>
         </size>
        </property>
+       <property name="font">
+        <font>
+         <pointsize>12</pointsize>
+        </font>
+       </property>
        <property name="frameShape">
         <enum>QFrame::NoFrame</enum>
        </property>
@@ -152,7 +157,7 @@
   </action>
   <action name="actionOptions">
    <property name="icon">
-    <iconset>
+    <iconset resource="images.qrc">
      <normaloff>:/images/kcmsystem24.png</normaloff>:/images/kcmsystem24.png</iconset>
    </property>
    <property name="text">
diff --git a/retroshare-gui/src/gui/NewsFeed.ui b/retroshare-gui/src/gui/NewsFeed.ui
index ff8c17f5e..32a679a74 100644
--- a/retroshare-gui/src/gui/NewsFeed.ui
+++ b/retroshare-gui/src/gui/NewsFeed.ui
@@ -70,8 +70,8 @@
        <widget class="QLabel" name="titleBarLabel">
         <property name="font">
          <font>
-		  <pointsize>12</pointsize>
-		  <weight>75</weight>
+          <pointsize>12</pointsize>
+          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
diff --git a/retroshare-gui/src/gui/PluginManager.cpp b/retroshare-gui/src/gui/PluginManager.cpp
index e5ac7f7d5..2b6fa01a6 100644
--- a/retroshare-gui/src/gui/PluginManager.cpp
+++ b/retroshare-gui/src/gui/PluginManager.cpp
@@ -41,7 +41,7 @@
 PluginManager::PluginManager()
 {
     baseFolder =  //qApp->applicationDirPath()+"///plugins" ;
-RsApplication::dataDirectory() + "/plugins" ;
+Rshare::dataDirectory() + "/plugins" ;
     lastError = "No error.";
 
     viewWidget = 0;
diff --git a/retroshare-gui/src/gui/Posted/PhotoView.ui b/retroshare-gui/src/gui/Posted/PhotoView.ui
index 31db767c9..e1e7a21e5 100644
--- a/retroshare-gui/src/gui/Posted/PhotoView.ui
+++ b/retroshare-gui/src/gui/Posted/PhotoView.ui
@@ -22,6 +22,7 @@
      <property name="font">
       <font>
        <family>MS Sans Serif</family>
+       <pointsize>11</pointsize>
        <weight>75</weight>
        <italic>true</italic>
        <bold>true</bold>
@@ -102,6 +103,7 @@
        <property name="font">
         <font>
          <family>MS Sans Serif</family>
+         <pointsize>9</pointsize>
          <weight>50</weight>
          <bold>false</bold>
         </font>
@@ -112,7 +114,7 @@
       </widget>
      </item>
      <item>
-      <widget class="AvatarWidget" name="avatarWidget">
+      <widget class="AvatarWidget" name="avatarWidget" native="true">
        <property name="minimumSize">
         <size>
          <width>24</width>
@@ -132,6 +134,7 @@
        <property name="font">
         <font>
          <family>MS Sans Serif</family>
+         <pointsize>11</pointsize>
          <weight>75</weight>
          <italic>true</italic>
          <bold>true</bold>
@@ -147,6 +150,7 @@
        <property name="font">
         <font>
          <family>MS Sans Serif</family>
+         <pointsize>9</pointsize>
         </font>
        </property>
        <property name="text">
@@ -159,6 +163,7 @@
        <property name="font">
         <font>
          <family>MS Sans Serif</family>
+         <pointsize>9</pointsize>
         </font>
        </property>
        <property name="text">
@@ -204,17 +209,17 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>AvatarWidget</class>
-   <extends>QLabel</extends>
-   <header>gui/common/AvatarWidget.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>GxsIdLabel</class>
    <extends>QLabel</extends>
    <header>gui/gxs/GxsIdLabel.h</header>
   </customwidget>
+  <customwidget>
+   <class>AvatarWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/common/AvatarWidget.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>AspectRatioPixmapLabel</class>
    <extends>QLabel</extends>
diff --git a/retroshare-gui/src/gui/Posted/PostedItem.ui b/retroshare-gui/src/gui/Posted/PostedItem.ui
index ad37a936c..24d570b16 100644
--- a/retroshare-gui/src/gui/Posted/PostedItem.ui
+++ b/retroshare-gui/src/gui/Posted/PostedItem.ui
@@ -44,10 +44,10 @@
       <bool>false</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <property name="leftMargin">
@@ -262,6 +262,7 @@
           </property>
           <property name="font">
            <font>
+            <pointsize>11</pointsize>
             <weight>75</weight>
             <italic>true</italic>
             <bold>true</bold>
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index ebc0aca2b..1798bb4bc 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -45,7 +45,6 @@
 #include "util/DateTime.h"
 #include "util/qtthreadsutils.h"
 #include "gui/common/FilesDefs.h"
-#include "util/QtVersion.h"
 
 #include "gui/MainWindow.h"
 
@@ -418,7 +417,7 @@ void PostedListWidgetWithModel::updateShowLabel()
 
 void PostedListWidgetWithModel::filterItems(QString text)
 {
-	QStringList lst = text.split(" ",QtSkipEmptyParts) ;
+	QStringList lst = text.split(" ",QString::SkipEmptyParts) ;
 
     uint32_t count;
 	mPostedPostsModel->setFilter(lst,count) ;
@@ -620,13 +619,12 @@ void PostedListWidgetWithModel::updateGroupData()
 
 void PostedListWidgetWithModel::postPostLoad()
 {
-#ifdef DEBUG_POSTED
 	std::cerr << "Post channel load..." << std::endl;
-#endif
 	whileBlocking(ui->filter_LE)->setText(QString()); //Clear it before navigate, as it will update it.
 
 	if (!mNavigatePendingMsgId.isNull())
 		navigate(mNavigatePendingMsgId);
+
 #ifdef TO_REMOVE
 	else if( (mLastSelectedPosts.count(groupId()) > 0)
 	         && !mLastSelectedPosts[groupId()].isNull())
@@ -641,10 +639,8 @@ void PostedListWidgetWithModel::postPostLoad()
 		ui->postsTree->setFocus();
 	}
 #endif
-#ifdef DEBUG_POSTED
 	else
 		std::cerr << "No pre-selected channel post." << std::endl;
-#endif
 
 	updateShowLabel();
 }
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
index 734c4a233..8074388dc 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui
@@ -54,7 +54,7 @@
              <string notr="true">&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:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="textInteractionFlags">
@@ -355,10 +355,10 @@ p, li { white-space: pre-wrap; }
        <item>
         <widget class="QFrame" name="toolBarFrame">
          <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_3">
           <property name="leftMargin">
@@ -576,10 +576,37 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/ElidedLabel.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>GxsIdChooser</class>
+   <extends>QComboBox</extends>
+   <header>gui/gxs/GxsIdChooser.h</header>
+  </customwidget>
+  <customwidget>
+   <class>GxsIdLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/gxs/GxsIdLabel.h</header>
+  </customwidget>
   <customwidget>
    <class>LineEditClear</class>
    <extends>QLineEdit</extends>
-   <header location="global">gui/common/LineEditClear.h</header>
+   <header>gui/common/LineEditClear.h</header>
+  </customwidget>
+  <customwidget>
+   <class>RSComboBox</class>
+   <extends>QComboBox</extends>
+   <header>gui/common/RSComboBox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>RSTabWidget</class>
+   <extends>QTabWidget</extends>
+   <header>gui/common/RSTabWidget.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>RSTreeView</class>
@@ -587,42 +614,15 @@ p, li { white-space: pre-wrap; }
    <header>gui/common/RSTreeView.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>GxsIdLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/gxs/GxsIdLabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ElidedLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/common/ElidedLabel.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>SubscribeToolButton</class>
    <extends>QToolButton</extends>
    <header>gui/common/SubscribeToolButton.h</header>
   </customwidget>
-  <customwidget>
-   <class>RSComboBox</class>
-   <extends>QComboBox</extends>
-   <header>gui/common/RSComboBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>GxsIdChooser</class>
-   <extends>QComboBox</extends>
-   <header>gui/gxs/GxsIdChooser.h</header>
-  </customwidget>
-  <customwidget>
-   <class>RSTabWidget</class>
-   <extends>QTabWidget</extends>
-   <header>gui/common/RSTabWidget.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="Posted_images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/RSHumanReadableDelegate.h b/retroshare-gui/src/gui/RSHumanReadableDelegate.h
index 1b3995cd7..18943c1dc 100644
--- a/retroshare-gui/src/gui/RSHumanReadableDelegate.h
+++ b/retroshare-gui/src/gui/RSHumanReadableDelegate.h
@@ -88,16 +88,11 @@ class RSHumanReadableAgeDelegate: public RSHumanReadableDelegate
 	public:
 		virtual void paint(QPainter *painter,const QStyleOptionViewItem & option, const QModelIndex & index) const
 		{
-			painter->save();
 			QStyleOptionViewItem opt(option) ;
 			setPainterOptions(painter,opt,index) ;
 
-            if(index.data().toLongLong() > 0) {	// no date is present.
-                painter->setFont(opt.font);
-                painter->drawText(opt.rect, opt.displayAlignment, misc::timeRelativeToNow(index.data().toLongLong())) ;
-            }
-
-            painter->restore();
+            if(index.data().toLongLong() > 0)	// no date is present.
+                painter->drawText(opt.rect, Qt::AlignCenter, misc::timeRelativeToNow(index.data().toLongLong())) ;
 		}
 };
 
@@ -106,14 +101,10 @@ class RSHumanReadableSizeDelegate: public RSHumanReadableDelegate
 	public:
 		virtual void paint(QPainter *painter,const QStyleOptionViewItem & option, const QModelIndex & index) const
 		{
-			painter->save();
 			QStyleOptionViewItem opt(option) ;
 			setPainterOptions(painter,opt,index) ;
 
-			painter->setFont(opt.font);
-			painter->drawText(opt.rect, opt.displayAlignment, misc::friendlyUnit(index.data().toULongLong()));
-
-			painter->restore();
+			painter->drawText(opt.rect, Qt::AlignRight, misc::friendlyUnit(index.data().toULongLong()));
 		}
 };
 
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index 962001a76..05e19857f 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -24,7 +24,7 @@
 
 #include "gui/common/FilesDefs.h"
 #include "gui/common/GroupDefs.h"
-#include "gui/common/RsCollectionDialog.h"
+#include "gui/common/RsCollection.h"
 #include "gui/common/RsUrlHandler.h"
 #include "gui/gxs/GxsIdDetails.h"
 #include "retroshare/rsfiles.h"
@@ -1233,6 +1233,31 @@ bool RetroshareDirModel::requestDirDetails(void *ref, bool remote,DirDetails& d)
     return false ;
 }
 
+void RetroshareDirModel::createCollectionFile(QWidget *parent, const QModelIndexList &list)
+{
+/*	if(RemoteMode)
+	{
+		std::cerr << "Cannot create a collection file from remote" << std::endl;
+		return ;
+	}*/
+
+	std::vector <DirDetails> dirVec;
+	getDirDetailsFromSelect(list, dirVec);
+
+	FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
+	
+	QString dir_name;
+	if(!RemoteMode)
+	{
+		if(!dirVec.empty())
+		{
+			const DirDetails& details = dirVec[0];
+			dir_name = QDir(QString::fromUtf8(details.name.c_str())).dirName();
+		}
+	}
+	RsCollection(dirVec,f).openNewColl(parent,dir_name);
+}
+
 void RetroshareDirModel::downloadSelected(const QModelIndexList &list,bool interactive)
 {
 	if (!RemoteMode)
@@ -1253,7 +1278,7 @@ void RetroshareDirModel::downloadSelected(const QModelIndexList &list,bool inter
    FileSearchFlags f = RemoteMode?RS_FILE_HINTS_REMOTE:RS_FILE_HINTS_LOCAL ;
 
    if(interactive)
-       RsCollectionDialog::downloadFiles(RsCollection(dirVec,f)) ;
+	   RsCollection(dirVec,f).downloadFiles() ;
    else /* Fire off requests */
 	   for (int i = 0, n = dirVec.size(); i < n; ++i)
 	   {
diff --git a/retroshare-gui/src/gui/RemoteDirModel.h b/retroshare-gui/src/gui/RemoteDirModel.h
index b7811533e..83028dd48 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.h
+++ b/retroshare-gui/src/gui/RemoteDirModel.h
@@ -68,6 +68,8 @@ class RetroshareDirModel : public QAbstractItemModel
 
 		/* Callback from GUI */
 		void downloadSelected(const QModelIndexList &list, bool interactive);
+		void createCollectionFile(QWidget *parent, const QModelIndexList &list);
+
 		void getDirDetailsFromSelect (const QModelIndexList &list, std::vector <DirDetails>& dirVec);
 
 		int getType ( const QModelIndex & index ) const ;
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 0001cd9bc..6e377f70e 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -25,7 +25,7 @@
 #include "HomePage.h"
 #include "chat/ChatDialog.h"
 #include "common/PeerDefs.h"
-#include "common/RsCollectionDialog.h"
+#include "common/RsCollection.h"
 #include "common/RsUrlHandler.h"
 #include "connect/ConfCertDialog.h"
 #include "connect/ConnectFriendWizard.h"
@@ -1143,13 +1143,11 @@ QString RetroShareLink::toHtmlSize() const
 
 	if (type() == TYPE_FILE && RsCollection::isCollectionFile(name())) {
 		FileInfo finfo;
-        if (rsFiles->FileDetails(RsFileHash(hash().toStdString()), RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL, finfo))
-        {
-            RsCollection::RsCollectionErrorCode code;
-            RsCollection collection(QString::fromUtf8(finfo.path.c_str()), code) ;
-
-            if(code == RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
+		if (rsFiles->FileDetails(RsFileHash(hash().toStdString()), RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL, finfo)) {
+			RsCollection collection;
+			if (collection.load(QString::fromUtf8(finfo.path.c_str()), false)) {
 				size += QString(" [%1]").arg(misc::friendlyUnit(collection.size()));
+			}
 		}
 	}
 	QString link = QString("<a href=\"%1\">%2</a> <font color=\"blue\">%3</font>").arg(toString()).arg(name()).arg(size);
@@ -1724,9 +1722,10 @@ static void processList(const QStringList &list, const QString &textSingular, co
 
 		case TYPE_FILE_TREE:
 		{
-            auto ft = RsFileTree::fromRadix64(link.radix().toStdString() );
-            RsCollectionDialog::downloadFiles(RsCollection(*ft));
-            break;
+			auto ft = RsFileTree::fromRadix64(
+			            link.radix().toStdString() );
+			RsCollection(*ft).downloadFiles();
+			break;
 		}
 
 			case TYPE_CHAT_ROOM:
@@ -1777,7 +1776,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
 
 	// were single file links found?
 	if (fileLinkFound)
-        RsCollectionDialog::downloadFiles(col);
+		col.downloadFiles();
 
 	int countProcessed = 0;
 	int countError = 0;
@@ -1920,9 +1919,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
 void RSLinkClipboard::copyLinks(const QList<RetroShareLink>& links)
 {
 	QString res ;
-	if(links.size() == 1)
-		res += links[0].toString();
-	else for(int i = 0; i < links.size(); ++i)
+	for (int i = 0; i < links.size(); ++i)
 		res += links[i].toString() + "\n" ;
 
 	QApplication::clipboard()->setText(res) ;
@@ -2038,3 +2035,4 @@ void RSLinkClipboard::parseText(QString text, QList<RetroShareLink> &links,Retro
 		pos += rx.matchedLength();
 	}
 }
+
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index 237d1bb83..d6f9f707d 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -123,7 +123,7 @@ void StartDialog::loadPerson()
 	rsNotify->cachePgpPassphrase(ui.password_input->text().toUtf8().constData()) ;
 	rsNotify->setDisableAskPassword(true);
 
-    bool res = RsApplication::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
+    bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
 
 	rsNotify->setDisableAskPassword(false);
     rsNotify->clearPgpPassphrase();
@@ -161,7 +161,7 @@ void StartDialog::notSecureWarning()
 		QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Keychain. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
 #else
         // this handles all linux systems at once.
-        QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your desktop's keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
+        QMessageBox::warning ( this, tr("Warning"), tr("The password to your SSL certificate (your node) will be stored encrypted in your Gnome Keyring. \n\n Your PGP passwd will not be stored.\n\nThis choice can be reverted in settings."), QMessageBox::Ok);
 #endif
 #endif
 }
diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui
index 39287a797..8c491caeb 100644
--- a/retroshare-gui/src/gui/StartDialog.ui
+++ b/retroshare-gui/src/gui/StartDialog.ui
@@ -345,8 +345,8 @@ The current identities/locations will not be affected.</string>
            <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;
 &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:'Sans'; font-size:13pt; 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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:14pt; text-decoration: underline; color:#366fe0;&quot;&gt;New Profile/Node&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; 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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;New Profile/Node&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
@@ -370,8 +370,8 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="icons.qrc"/>
   <include location="images.qrc"/>
+  <include location="icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index d3b666a7e..8877d5cf6 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -25,7 +25,6 @@
 #include "gui/gxs/GxsIdDetails.h"
 #include "gui/common/FilesDefs.h"
 #include "util/misc.h"
-#include "util/qtthreadsutils.h"
 
 #include "PulseAddDialog.h"
 
@@ -99,31 +98,11 @@ void PulseAddDialog::setGroup(RsWireGroup &group)
 // set ReplyWith Group.
 void PulseAddDialog::setGroup(const RsGxsGroupId &grpId)
 {
-    if(grpId.isNull()){
-        return;
-    }
+	/* fetch in the background */
+	RsWireGroupSPtr pGroup;
+	rsWire->getWireGroup(grpId, pGroup);
 
-    RsThread::async([this,grpId](){
-
-        RsWireGroupSPtr pGroup;
-        if(!rsWire->getWireGroup(grpId,pGroup))
-        {
-            std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve wire group info for wire id:  " << grpId << std::endl;
-            return;
-        }
-
-        RsQThreadUtils::postToObject( [pGroup,this]()
-        {
-            /* Here it goes any code you want to be executed on the Qt Gui
-             * thread, for example to update the data model with new information
-             * after a blocking call to RetroShare API complete, note that
-             * Qt::QueuedConnection is important!
-             */
-
-            setGroup(*pGroup);
-        }, this );
-
-    });
+	setGroup(*pGroup);
 }
 
 void PulseAddDialog::cleanup()
@@ -215,7 +194,7 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
 	mReplyToPulse = pulse;
 	mReplyType = replyType;
 	ui.frame_reply->setVisible(true);
-	ui.pushButton_picture->hide();
+	ui.pushButton_picture->show();
 	ui.topheadshot->hide();
 
 	{
@@ -244,12 +223,10 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
 		if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
 			ui.postButton->setText(tr("Republish Pulse"));
 			ui.pushButton_picture->hide();
-			ui.pushButton_Browse->hide();
 		}
 		else if (mReplyType & WIRE_PULSE_TYPE_LIKE) {
 			ui.postButton->setText(tr("Like Pulse"));
 			ui.pushButton_picture->hide();
-			ui.pushButton_Browse->hide();
 		}
 	}
 
@@ -257,46 +234,30 @@ void PulseAddDialog::setReplyTo(const RsWirePulse &pulse, RsWirePulseSPtr pPulse
 
 void PulseAddDialog::setReplyTo(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId, uint32_t replyType)
 {
-    if(grpId.isNull()){
-        return;
-    }
 	/* fetch in the background */
+	RsWireGroupSPtr pGroup;
+	if (!rsWire->getWireGroup(grpId, pGroup))
+	{
+		std::cerr << "PulseAddDialog::setRplyTo() failed to fetch group";
+		std::cerr << std::endl;
+		return;
+	}
 
-    RsThread::async([this,grpId,msgId,replyType](){
+	RsWirePulseSPtr pPulse;
+	if (!rsWire->getWirePulse(grpId, msgId, pPulse))
+	{
+		std::cerr << "PulseAddDialog::setRplyTo() failed to fetch pulse";
+		std::cerr << std::endl;
+		return;
+	}
 
-        RsWireGroupSPtr pGroup;
-        RsWirePulseSPtr pPulse;
-        if(!rsWire->getWireGroup(grpId,pGroup))
-        {
-            std::cerr << __PRETTY_FUNCTION__ << "PulseAddDialog::setRplyTo() failed to fetch group id: "  << grpId << std::endl;
-            return;
-        }
-
-        if (!rsWire->getWirePulse(grpId, msgId, pPulse))
-        {
-            std::cerr << "PulseAddDialog::setRplyTo() failed to fetch pulse of group id: " << grpId << std::endl;
-            return;
-        }
-
-        // update GroupPtr
-        // TODO - this should be handled in libretroshare if possible.
-        if (pPulse->mGroupPtr == NULL) {
-            pPulse->mGroupPtr = pGroup;
-        }
-
-        RsQThreadUtils::postToObject( [pGroup,this,pPulse,replyType]()
-        {
-            /* Here it goes any code you want to be executed on the Qt Gui
-             * thread, for example to update the data model with new information
-             * after a blocking call to RetroShare API complete, note that
-             * Qt::QueuedConnection is important!
-             */
-
-            setReplyTo(*pPulse, pPulse, pGroup->mMeta.mGroupName, replyType);
-        }, this );
-
-    });
+	// update GroupPtr
+	// TODO - this should be handled in libretroshare if possible.
+	if (pPulse->mGroupPtr == NULL) {
+		pPulse->mGroupPtr = pGroup;
+	}
 
+	setReplyTo(*pPulse, pPulse, pGroup->mMeta.mGroupName, replyType);
 }
 
 void PulseAddDialog::addURL()
@@ -346,39 +307,26 @@ void PulseAddDialog::postOriginalPulse()
 	std::cerr << "PulseAddDialog::postOriginalPulse()";
 	std::cerr << std::endl;
 
-    RsWirePulseSPtr pPulse(new RsWirePulse());
+	RsWirePulseSPtr pPulse(new RsWirePulse());
 
-    pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
-    pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
-    // set images here too.
-    pPulse->mImage1 = mImage1;
-    pPulse->mImage2 = mImage2;
-    pPulse->mImage3 = mImage3;
-    pPulse->mImage4 = mImage4;
+	pPulse->mSentiment = WIRE_PULSE_SENTIMENT_NO_SENTIMENT;
+	pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
+	// set images here too.
+	pPulse->mImage1 = mImage1;
+	pPulse->mImage2 = mImage2;
+	pPulse->mImage3 = mImage3;
+	pPulse->mImage4 = mImage4;
 
-    RsThread::async([this,pPulse](){
-
-        if (!rsWire->createOriginalPulse(mGroup.mMeta.mGroupId, pPulse))
-        {
-            std::cerr << "PulseAddDialog::postOriginalPulse() FAILED";
-            std::cerr << std::endl;
-            return;
-        }
-
-        RsQThreadUtils::postToObject( [this]()
-        {
-            /* Here it goes any code you want to be executed on the Qt Gui
-             * thread, for example to update the data model with new information
-             * after a blocking call to RetroShare API complete, note that
-             * Qt::QueuedConnection is important!
-             */
-
-            clearDialog();
-            hide();
-        }, this );
-
-    });
+	// this should be in async thread, so doesn't block UI thread.
+	if (!rsWire->createOriginalPulse(mGroup.mMeta.mGroupId, pPulse))
+	{
+		std::cerr << "PulseAddDialog::postOriginalPulse() FAILED";
+		std::cerr << std::endl;
+		return;
+	}
 
+	clearDialog();
+	hide();
 }
 
 uint32_t PulseAddDialog::toPulseSentiment(int index)
@@ -408,15 +356,15 @@ void PulseAddDialog::postReplyPulse()
 	std::cerr << "PulseAddDialog::postReplyPulse()";
 	std::cerr << std::endl;
 
-    RsWirePulseSPtr pPulse(new RsWirePulse());
+	RsWirePulseSPtr pPulse(new RsWirePulse());
 
-    pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
-    pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
-    // set images here too.
-    pPulse->mImage1 = mImage1;
-    pPulse->mImage2 = mImage2;
-    pPulse->mImage3 = mImage3;
-    pPulse->mImage4 = mImage4;
+	pPulse->mSentiment = toPulseSentiment(ui.comboBox_sentiment->currentIndex());
+	pPulse->mPulseText = ui.textEdit_Pulse->toPlainText().toStdString();
+	// set images here too.
+	pPulse->mImage1 = mImage1;
+	pPulse->mImage2 = mImage2;
+	pPulse->mImage3 = mImage3;
+	pPulse->mImage4 = mImage4;
 
 	if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
 		// Copy details from parent, and override
@@ -430,33 +378,20 @@ void PulseAddDialog::postReplyPulse()
 		pPulse->mImage4 = mReplyToPulse.mImage4;
 	}
 
-    RsThread::async([this, pPulse](){
-
-        if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
-                mReplyToPulse.mMeta.mOrigMsgId,
-                mGroup.mMeta.mGroupId,
-                mReplyType,
-                pPulse))
-        {
-            std::cerr << "PulseAddDialog::postReplyPulse() FAILED";
-            std::cerr << std::endl;
-            return;
-        }
-
-        RsQThreadUtils::postToObject( [this]()
-        {
-            /* Here it goes any code you want to be executed on the Qt Gui
-             * thread, for example to update the data model with new information
-             * after a blocking call to RetroShare API complete, note that
-             * Qt::QueuedConnection is important!
-             */
-
-            clearDialog();
-            hide();
-        }, this );
-
-    });
+	// this should be in async thread, so doesn't block UI thread.
+	if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
+			mReplyToPulse.mMeta.mOrigMsgId,
+			mGroup.mMeta.mGroupId,
+			mReplyType,
+			pPulse))
+	{
+		std::cerr << "PulseAddDialog::postReplyPulse() FAILED";
+		std::cerr << std::endl;
+		return;
+	}
 
+	clearDialog();
+	hide();
 }
 
 void PulseAddDialog::clearDialog()
diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
index bdfda3cc5..c09119a40 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
@@ -140,7 +140,7 @@
        <widget class="QWidget" name="widget_sentiment" native="true">
         <layout class="QHBoxLayout" name="widget_sentiment_HL">
          <property name="leftMargin">
-          <number>9</number>
+          <number>20</number>
          </property>
          <property name="topMargin">
           <number>0</number>
diff --git a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
index 6564fe5e3..4a605a219 100644
--- a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui
@@ -40,7 +40,10 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true"/>
+      <string notr="true">QFrame#frame{border: 2px solid #CCCCCC;
+background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+                                     stop: 0 #EEEEEE, stop: 1 #CCCCCC);
+border-radius: 10px}</string>
      </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 36a201a7f..38ea1b398 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -140,7 +140,6 @@ WireDialog::~WireDialog()
 	processSettings(false);
 	
 	clearTwitterView();
-    std::cerr << "WireDialog::~WireDialog()" << std::endl;
     delete(mWireQueue);
 
     rsEvents->unregisterEventsHandler(mEventHandlerId);
@@ -155,16 +154,9 @@ void WireDialog::processSettings(bool load)
 
 		// state of splitter
 		ui.splitter->restoreState(Settings->value("SplitterWire").toByteArray());
-
-		// state of filter combobox
-		int index = Settings->value("ShowGroup", 0).toInt();
-		ui.comboBox_groupSet->setCurrentIndex(index);
 	} else {
 		// save settings
 
-		// state of filter combobox
-		Settings->setValue("ShowGroup", ui.comboBox_groupSet->currentIndex());
-
 		// state of splitter
 		Settings->setValue("SplitterWire", ui.splitter->saveState());
 	}
@@ -475,13 +467,13 @@ bool WireDialog::loadGroupData(const uint32_t &token)
 	std::cerr << "WireDialog::loadGroupData()";
 	std::cerr << std::endl;
 
-    std::vector<RsWireGroup> groups;
-    rsWire->getGroupData(token, groups);
+	std::vector<RsWireGroup> groups;
+	rsWire->getGroupData(token, groups);
 
-    // save list of groups.
-    updateGroups(groups);
-    showGroups();
-    return true;
+	// save list of groups.
+	updateGroups(groups);
+	showGroups();
+	return true;
 }
 
 rstime_t WireDialog::getFilterTimestamp()
@@ -689,7 +681,6 @@ void WireDialog::PVHrate(const RsGxsId &authorId)
 void WireDialog::postTestTwitterView()
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::postTestTwitterView()" << std::endl;
 
 	addTwitterView(new PulseTopLevel(NULL,RsWirePulseSPtr())); 
 	addTwitterView(new PulseReply(NULL,RsWirePulseSPtr()));
@@ -846,7 +837,6 @@ void WireDialog::requestPulseFocus(const RsGxsGroupId groupId, const RsGxsMessag
 void WireDialog::showPulseFocus(const RsGxsGroupId groupId, const RsGxsMessageId msgId)
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::showPulseFocus()" << std::endl;
 
 	// background thread for loading.
 	RsThread::async([this, groupId, msgId]()
@@ -876,8 +866,6 @@ void WireDialog::showPulseFocus(const RsGxsGroupId groupId, const RsGxsMessageId
 void WireDialog::postPulseFocus(RsWirePulseSPtr pPulse)
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::postPulseFocus()" << std::endl;
-
 	if (!pPulse)
 	{
 		std::cerr << "WireDialog::postPulseFocus() Invalid pulse";
@@ -950,7 +938,7 @@ void WireDialog::requestGroupFocus(const RsGxsGroupId groupId)
 void WireDialog::showGroupFocus(const RsGxsGroupId groupId)
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::showGroupFocus()" << std::endl;
+
 	// background thread for loading.
 	RsThread::async([this, groupId]()
 	{
@@ -1027,7 +1015,6 @@ void WireDialog::requestGroupsPulses(const std::list<RsGxsGroupId>& groupIds)
 void WireDialog::showGroupsPulses(const std::list<RsGxsGroupId>& groupIds)
 {
 	clearTwitterView();
-    std::cerr << "WireDialog::showGroupPulses()" << std::endl;
 
 	// background thread for loading.
 	RsThread::async([this, groupIds]()
@@ -1077,3 +1064,4 @@ void WireDialog::postGroupsPulses(std::list<RsWirePulseSPtr> pulses)
 
 	}
 }
+
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.h b/retroshare-gui/src/gui/TheWire/WireDialog.h
index fcd33ad37..a55369fc0 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.h
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.h
@@ -150,7 +150,7 @@ private:
 
 	// Loading Data.
 	void requestGroupData();
-    bool loadGroupData(const uint32_t &token);
+	bool loadGroupData(const uint32_t &token);
 	void acknowledgeGroup(const uint32_t &token, const uint32_t &userType);
 
 	virtual void loadRequest(const TokenQueue *queue, const TokenRequest &req) override;
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
index 1759103f6..199800581 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
@@ -123,21 +123,21 @@ void WireGroupItem::setup()
 void WireGroupItem::setGroupSet()
 {
 	if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) {
-		toolButton_type->setText(tr("Own"));
-		toolButton_subscribe->setText(tr("N/A"));
+		toolButton_type->setText("Own");
+		toolButton_subscribe->setText("N/A");
 		toolButton_subscribe->setEnabled(false);
 		editButton->show();
 	}
 	else if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)
 	{
-		toolButton_type->setText(tr("Following"));
-		toolButton_subscribe->setText(tr("Unfollow"));
+		toolButton_type->setText("Following");
+		toolButton_subscribe->setText("Unfollow");
 		editButton->hide();
 	}
 	else
 	{
-		toolButton_type->setText(tr("Other"));
-		toolButton_subscribe->setText(tr("Follow"));
+		toolButton_type->setText("Other");
+		toolButton_subscribe->setText("Follow");
 		editButton->hide();
 	}
 }
diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
index 9387f951e..f6b150065 100644
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp
@@ -20,7 +20,6 @@
  *                                                                             *
  *******************************************************************************/
 #include "expressionwidget.h"
-#include "util/QtVersion.h"
 
 ExpressionWidget::ExpressionWidget(QWidget * parent, bool initial)
     : QWidget(parent)
@@ -110,7 +109,11 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
     if (isStringSearchExpression()) 
     {
         QString txt = exprParamElem->getStrSearchValue();
-        QStringList words = txt.split(" ", QtSkipEmptyParts);
+#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
+        QStringList words = txt.split(" ", QString::SkipEmptyParts);
+#else
+        QStringList words = txt.split(" ", Qt::SkipEmptyParts);
+#endif
         for (int i = 0; i < words.size(); ++i)
             wordList.push_back(words.at(i).toUtf8().constData());
     } else if (inRangedConfig){
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
index fbc35d2cf..3b92883e8 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@@ -23,7 +23,6 @@
 #include <QMenu>
 #include <QMessageBox>
 #include <QWidgetAction>
-#include <QActionGroup>
 
 #include "ChatLobbyDialog.h"
 
@@ -209,8 +208,6 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
 	connect(unsubscribeButton, SIGNAL(clicked()), this , SLOT(leaveLobby()));
 
 	getChatWidget()->addTitleBarWidget(unsubscribeButton) ;
-
-	mFontSizeHandler.registerFontSize(ui.participantsList);
 }
 
 void ChatLobbyDialog::leaveLobby()
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
index c3572cc4b..065abacee 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h
@@ -26,7 +26,6 @@
 #include "gui/common/RSTreeWidgetItem.h"
 #include "ChatDialog.h"
 #include "PopupChatWindow.h"
-#include "util/FontSizeHandler.h"
 
 // Q_DECLARE_METATYPE(RsGxsId)
 // Q_DECLARE_METATYPE(QList<RsGxsId>)
@@ -116,8 +115,6 @@ private:
 	bool mWindowedSetted;
 	PopupChatWindow* mPCWindow;
 
-	FontSizeHandler mFontSizeHandler;
-
 	/** Qt Designer generated object */
 	Ui::ChatLobbyDialog ui;
 
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui b/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
index e00790f83..0851eba15 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.ui
@@ -80,10 +80,10 @@
        <item>
         <widget class="QFrame" name="toolBarFrame">
          <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QHBoxLayout" name="toolBarFrame_HL">
           <property name="leftMargin">
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
index 719ad7d2d..4407cc73c 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp
@@ -146,48 +146,8 @@ QString ChatLobbyUserNotify::getNotifyMessage(bool plural)
 
 void ChatLobbyUserNotify::iconClicked()
 {
-    #if defined(Q_OS_DARWIN)
-    std::list<ChatLobbyId> lobbies;
-    rsMsgs->getChatLobbyList(lobbies);
-    bool doUpdate=false;
-
-    for (lobby_map::iterator itCL=_listMsg.begin(); itCL!=_listMsg.end();)
-    {
-        bool bFound=false;
-        QString strLobbyName=tr("Unknown Lobby");
-        QIcon icoLobby=QIcon();
-        std::list<ChatLobbyId>::const_iterator lobbyIt;
-        for (lobbyIt = lobbies.begin(); lobbyIt != lobbies.end(); ++lobbyIt) {
-            ChatLobbyId clId = *lobbyIt;
-            if (clId==itCL->first) {
-                ChatLobbyInfo clInfo;
-                if (rsMsgs->getChatLobbyInfo(clId,clInfo))
-                    strLobbyName=QString::fromUtf8(clInfo.lobby_name.c_str()) ;
-                bFound=true;
-                break;
-            }
-        }
-
-        if (bFound)
-        {
-            MainWindow::showWindow(MainWindow::ChatLobby);
-            ChatLobbyWidget *chatLobbyWidget = dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby));
-            if (chatLobbyWidget) chatLobbyWidget->showLobbyAnchor(itCL->first,strLobbyName);
-            ++itCL ;
-        }
-        else
-        {
-            lobby_map::iterator ittmp(itCL);
-            ++ittmp ;
-            _listMsg.erase(itCL);
-            itCL=ittmp ;
-            doUpdate=true;
-        }
-    }
-    #else
-
 	/// Tray icon Menu ///
-	QMenu* trayMenu = createMenu();
+	QMenu* trayMenu = new QMenu(MainWindow::getInstance());
 	std::list<ChatLobbyId> lobbies;
 	rsMsgs->getChatLobbyList(lobbies);
 	bool doUpdate=false;
@@ -226,25 +186,27 @@ void ChatLobbyUserNotify::iconClicked()
         }
     }
 
+	if (notifyCombined()) {
+		QSystemTrayIcon* trayIcon=getTrayIcon();
+		if (trayIcon!=NULL) trayIcon->setContextMenu(trayMenu);
+	} else {
+		QAction* action=getNotifyIcon();
+		if (action!=NULL) {
+			action->setMenu(trayMenu);
+		}
+	}
+
 	QString strName=tr("Remove All");
 	QAction *pAction = new QAction( QIcon(), strName, trayMenu);
 	ActionTag actionTag={0x0, "", true};
 	pAction->setData(qVariantFromValue(actionTag));
+	connect(trayMenu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
+	connect(trayMenu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
 	trayMenu->addAction(pAction);
 
 	trayMenu->exec(QCursor::pos());
-	delete(trayMenu);
 	if (doUpdate) updateIcon();
 
-	#endif
-}
-
-QMenu* ChatLobbyUserNotify::createMenu()
-{
-	QMenu* menu = new QMenu(MainWindow::getInstance());
-	connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
-	connect(menu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
-	return menu;
 }
 
 void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString strLobbyName, ChatLobbyId id)
@@ -255,7 +217,11 @@ void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString
 
 	unsigned int msgCount=msgMap.size();
 
+	if(!parentMenu) parentMenu = new QMenu(MainWindow::getInstance());
 	QMenu *lobbyMenu = parentMenu->addMenu(icoLobby, strLobbyName);
+	connect(lobbyMenu, SIGNAL(triggered(QAction*)), this, SLOT(subMenuClicked(QAction*)));
+	connect(lobbyMenu, SIGNAL(hovered(QAction*)), this, SLOT(subMenuHovered(QAction*)));
+
 	lobbyMenu->setToolTip(getNotifyMessage(msgCount>1).arg(msgCount));
 
 	for (msg_map::iterator itMsg=msgMap.begin(); itMsg!=msgMap.end(); ++itMsg) {
@@ -277,6 +243,7 @@ void ChatLobbyUserNotify::makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString
 	ActionTag actionTag={itCL->first, "", true};
 	pAction->setData(qVariantFromValue(actionTag));
 	lobbyMenu->addAction(pAction);
+
 }
 
 void ChatLobbyUserNotify::iconHovered()
@@ -284,6 +251,7 @@ void ChatLobbyUserNotify::iconHovered()
 	iconClicked();
 }
 
+
 void ChatLobbyUserNotify::chatLobbyNewMessage(ChatLobbyId lobby_id, QDateTime time, QString senderName, QString msg)
 {
 
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h
index 2e49f450f..fd95511b4 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h
+++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h
@@ -49,7 +49,6 @@ public:
 	ChatLobbyUserNotify(QObject *parent = 0);
 
 	virtual bool hasSetting(QString *name, QString *group);
-	QMenu* createMenu();
 	void makeSubMenu(QMenu* parentMenu, QIcon icoLobby, QString strLobbyName, ChatLobbyId id);
 	void chatLobbyNewMessage(ChatLobbyId lobby_id, QDateTime time, QString senderName, QString msg);
 	void chatLobbyCleared(ChatLobbyId lobby_id, QString anchor, bool onlyUnread=false);
diff --git a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
index dcafae59a..5f78739c3 100644
--- a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
+++ b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
@@ -76,7 +76,7 @@ bool ChatUserNotify::hasSetting(QString *name, QString *group)
 
 QIcon ChatUserNotify::getIcon()
 {
-    return FilesDefs::getIconFromQtResourcePath(":/images/orange-bubble-64.png");
+    return FilesDefs::getIconFromQtResourcePath(":/images/chat.png");
 }
 
 QIcon ChatUserNotify::getMainIcon(bool hasNew)
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index abab8336a..03f954964 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -982,12 +982,11 @@ void ChatWidget::on_notifyButton_clicked()
 	if(!notify) return;
 	if (chatType() != CHATTYPE_LOBBY) return;
 
-	QMenu* menu = notify->createMenu();
+	QMenu* menu = new QMenu(MainWindow::getInstance());
 	QIcon icoLobby=(ui->notifyButton->icon());
 
 	notify->makeSubMenu(menu, icoLobby, title, chatId.toLobbyId());
 	menu->exec(ui->notifyButton->mapToGlobal(QPoint(0,ui->notifyButton->geometry().height())));
-	delete(menu);
 
 }
 
diff --git a/retroshare-gui/src/gui/common/AvatarDefs.cpp b/retroshare-gui/src/gui/common/AvatarDefs.cpp
index 3255501aa..ccca08707 100644
--- a/retroshare-gui/src/gui/common/AvatarDefs.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDefs.cpp
@@ -54,9 +54,7 @@ bool AvatarDefs::getAvatarFromSslId(const RsPeerId& sslId, QPixmap &avatar, cons
     /* get avatar */
     rsMsgs->getAvatarData(RsPeerId(sslId), data, size);
     if (size == 0) {
-        if (!defaultImage.isEmpty()) {
-            avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
-        }
+        avatar = FilesDefs::getPixmapFromQtResourcePath(defaultImage);
         return false;
     }
 
diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp
index a5e8d15d4..dd302b570 100644
--- a/retroshare-gui/src/gui/common/AvatarDialog.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp
@@ -30,7 +30,6 @@
 #include <QWidget>
 #include <QMessageBox>
 #include <QDir>
-#include <QVectorIterator>
 
 #include <iostream>
 #include <math.h>
@@ -107,8 +106,8 @@ void AvatarDialog::removeAvatar()
 
 void AvatarDialog::updateInterface()
 {
-	QPixmap pixmap = ui->avatarLabel->pixmap(Qt::ReturnByValue);
-	if (!pixmap.isNull()) {
+	const QPixmap *pixmap = ui->avatarLabel->pixmap();
+	if (pixmap && !pixmap->isNull()) {
 		ui->removeButton->setEnabled(true);
 	} else {
 		ui->removeButton->setEnabled(false);
@@ -123,7 +122,13 @@ void AvatarDialog::setAvatar(const QPixmap &avatar)
 
 void AvatarDialog::getAvatar(QPixmap &avatar)
 {
-	avatar = ui->avatarLabel->pixmap(Qt::ReturnByValue);
+	const QPixmap *pixmap = ui->avatarLabel->pixmap();
+	if (!pixmap) {
+		avatar = QPixmap();
+		return;
+	}
+
+	avatar = *pixmap;
 }
 
 void AvatarDialog::getAvatar(QByteArray &avatar)
diff --git a/retroshare-gui/src/gui/common/AvatarWidget.cpp b/retroshare-gui/src/gui/common/AvatarWidget.cpp
index 02151730a..e6d6d03d9 100644
--- a/retroshare-gui/src/gui/common/AvatarWidget.cpp
+++ b/retroshare-gui/src/gui/common/AvatarWidget.cpp
@@ -121,7 +121,7 @@ void AvatarWidget::setFrameType(FrameType type)
 
     //refreshAvatarImage();
     refreshStatus();
-    RsApplication::refreshStyleSheet(this, false);
+    Rshare::refreshStyleSheet(this, false);
 }
 void AvatarWidget::setId(const ChatId &id)
 {
@@ -174,7 +174,7 @@ void AvatarWidget::refreshStatus()
     case NO_FRAME:
     case NORMAL_FRAME:
     {
-        RsApplication::refreshStyleSheet(this, false);
+        Rshare::refreshStyleSheet(this, false);
         break;
     }
     case STATUS_FRAME:
@@ -252,7 +252,7 @@ void AvatarWidget::updateStatus(int status)
     mPeerState = status;
 
     setEnabled(((uint32_t) status == RS_STATUS_OFFLINE) ? false : true);
-    RsApplication::refreshStyleSheet(this, false);
+    Rshare::refreshStyleSheet(this, false);
 }
 
 void AvatarWidget::updateAvatar(const QString &peerId)
diff --git a/retroshare-gui/src/gui/common/FriendListModel.cpp b/retroshare-gui/src/gui/common/FriendListModel.cpp
index 45c054698..622ae3930 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.cpp
+++ b/retroshare-gui/src/gui/common/FriendListModel.cpp
@@ -65,7 +65,7 @@ static const uint32_t NODE_DETAILS_UPDATE_DELAY = 5;	// update each node every 5
 
 RsFriendListModel::RsFriendListModel(QObject *parent)
     : QAbstractItemModel(parent)
-    , mDisplayGroups(true), mDisplayStatusString(true), mDisplayStatusIcon (false)
+    , mDisplayGroups(true), mDisplayStatusString(true)
     , mLastInternalDataUpdate(0), mLastNodeUpdate(0)
 {
 	mFilterStrings.clear();
@@ -141,39 +141,13 @@ template<> bool RsFriendListModel::convertInternalIdToIndex<8>(quintptr ref,Entr
 	return true;
 }
 
-static QIcon createAvatar(const QPixmap &avatar, const QPixmap &overlay)
-{
-	int avatarWidth = avatar.width();
-	int avatarHeight = avatar.height();
-
-	QPixmap pixmap(avatar);
-
-	int overlaySize = (avatarWidth > avatarHeight) ? (avatarWidth/2.5) :  (avatarHeight/2.5);
-	int overlayX = avatarWidth - overlaySize;
-	int overlayY = avatarHeight - overlaySize;
-
-	QPainter painter(&pixmap);
-	painter.drawPixmap(overlayX, overlayY, overlaySize, overlaySize, overlay);
-
-	QIcon icon;
-	icon.addPixmap(pixmap);
-	return icon;
-}
 
 void RsFriendListModel::setDisplayStatusString(bool b)
 {
-	preMods();
     mDisplayStatusString = b;
 	postMods();
 }
 
-void RsFriendListModel::setDisplayStatusIcon(bool b)
-{
-	preMods();
-	mDisplayStatusIcon = b;
-	postMods();
-}
-
 void RsFriendListModel::setDisplayGroups(bool b)
 {
     mDisplayGroups = b;
@@ -304,16 +278,16 @@ uint32_t   RsFriendListModel::EntryIndex::parentRow(uint32_t nb_groups) const
     switch(type)
     {
     default:
-        case ENTRY_TYPE_UNKNOWN  : return -1;
-        case ENTRY_TYPE_GROUP    : return -1;
-        case ENTRY_TYPE_PROFILE  : return (group_index==UNDEFINED_GROUP_INDEX_VALUE)?(-1):group_index;
-        case ENTRY_TYPE_NODE     : return (group_index==UNDEFINED_GROUP_INDEX_VALUE)?(profile_index+nb_groups):profile_index;
+    	case ENTRY_TYPE_UNKNOWN  : return 0;
+    	case ENTRY_TYPE_GROUP    : return group_index;
+		case ENTRY_TYPE_PROFILE  : return (group_index==UNDEFINED_GROUP_INDEX_VALUE)?(profile_index+nb_groups):profile_index;
+    	case ENTRY_TYPE_NODE     : return node_index;
     }
 }
 
 QModelIndex RsFriendListModel::index(int row, int column, const QModelIndex& parent) const
 {
-    if(row < 0 || column < 0 || column >= columnCount(parent) || row >= rowCount(parent))
+    if(row < 0 || column < 0 || column >= COLUMN_THREAD_NB_COLUMNS)
 		return QModelIndex();
 
     if(parent.internalId() == 0)
@@ -439,28 +413,17 @@ QVariant RsFriendListModel::textColorRole(const EntryIndex& fmpe,int column) con
 {
 	switch(fmpe.type)
 	{
-        case ENTRY_TYPE_GROUP: 		return QVariant(QBrush(mTextColorGroup));
-        case ENTRY_TYPE_PROFILE:	return QVariant(QBrush(mTextColorStatus[onlineRole(fmpe,column).toInt()]));
-        case ENTRY_TYPE_NODE:  		return QVariant(QBrush(mTextColorStatus[statusRole(fmpe,column).toInt()]));
+		case ENTRY_TYPE_GROUP: return QVariant(QBrush(mTextColorGroup));
+		case ENTRY_TYPE_PROFILE:
+		case ENTRY_TYPE_NODE:  return QVariant(QBrush(mTextColorStatus[onlineRole(fmpe,column).toInt()]));
 		default:
 		return QVariant();
 	}
 }
 
-// statusRole returns the status (e.g. RS_STATUS_BUSY). It is used only to change the font color
-
-QVariant RsFriendListModel::statusRole(const EntryIndex& fmpe,int /*column*/) const
+QVariant RsFriendListModel::statusRole(const EntryIndex& /*fmpe*/,int /*column*/) const
 {
-    const HierarchicalNodeInformation *node = getNodeInfo(fmpe);
-
-    if(node)
-    {
-        StatusInfo status;
-        rsStatus->getStatus(node->node_info.id, status);
-
-        return QVariant(status.status);
-    }
-    return QVariant();
+    return QVariant();//fmpe.mMsgStatus);
 }
 
 bool RsFriendListModel::passesFilter(const EntryIndex& e,int /*column*/) const
@@ -585,9 +548,6 @@ QVariant RsFriendListModel::sortRole(const EntryIndex& entry,int column) const
     }
 }
 
-// Only returns two values: RS_STATUS_ONLINE, or RS_STATUS_OFFLINE. This is used to decide on text font (bold)
-// and whether profiles have children or not when offline nodes are shown.
-
 QVariant RsFriendListModel::onlineRole(const EntryIndex& e, int /*col*/) const
 {
 	switch(e.type)
@@ -625,10 +585,13 @@ QVariant RsFriendListModel::onlineRole(const EntryIndex& e, int /*col*/) const
 		{
 			const HierarchicalNodeInformation *node = getNodeInfo(e);
 
-            if(node && bool(node->node_info.state & RS_PEER_STATE_CONNECTED))
-                return QVariant(RS_STATUS_ONLINE);
-            else
-                return QVariant(RS_STATUS_OFFLINE);
+			if(node)
+			{
+				StatusInfo status;
+				rsStatus->getStatus(node->node_info.id, status);
+
+				return QVariant(status.status);
+			}
 		}
 	}
 	return QVariant(RS_STATUS_OFFLINE);
@@ -663,6 +626,12 @@ QVariant RsFriendListModel::fontRole(const EntryIndex& e, int col) const
 	}
 }
 
+class AutoEndel
+{
+public:
+    ~AutoEndel() { std::cerr << std::endl;}
+};
+
 QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
 {
 #ifdef DEBUG_MODEL_INDEX
@@ -781,7 +750,7 @@ QVariant RsFriendListModel::displayRole(const EntryIndex& e, int col) const
 						else
 						{
 							return QVariant(QString::fromUtf8(node->node_info.location.c_str())+"\n"
-                                        + "(" + StatusDefs::name(statusRole(e,col).toInt()) + ")");
+						                + "(" + StatusDefs::name(onlineRole(e,col).toInt()) + ")");
 						}
 					else
 						return QVariant(QString::fromUtf8(node->node_info.location.c_str()));
@@ -900,69 +869,6 @@ bool RsFriendListModel::getPeerOnlineStatus(const EntryIndex& e) const
     return (noded && (noded->node_info.state & RS_PEER_STATE_CONNECTED));
 }
 
-const RsFriendListModel::HierarchicalNodeInformation *RsFriendListModel::getBestNodeInformation(const HierarchicalProfileInformation *profileInfo, uint32_t *status) const
-{
-	if (status) {
-		*status = RS_STATUS_OFFLINE;
-	}
-
-	if (!profileInfo) {
-		return NULL;
-	}
-
-	const RsFriendListModel::HierarchicalNodeInformation *bestNodeInformation = NULL;
-	int bestStatusIndex = 0;
-
-	/* Find the best status */
-	for (uint32_t i = 0; i < profileInfo->child_node_indices.size(); ++i) {
-		const RsFriendListModel::HierarchicalNodeInformation &nodeInformation = mLocations[profileInfo->child_node_indices[i]];
-		StatusInfo statusInfo;
-		rsStatus->getStatus(nodeInformation.node_info.id, statusInfo);
-
-		int statusIndex = 0;
-		switch (statusInfo.status) {
-		case RS_STATUS_OFFLINE:
-			statusIndex = 1;
-			break;
-
-		case RS_STATUS_INACTIVE:
-			statusIndex = 2;
-			break;
-
-		case RS_STATUS_AWAY:
-			statusIndex = 3;
-			break;
-
-		case RS_STATUS_BUSY:
-			statusIndex = 4;
-			break;
-
-		case RS_STATUS_ONLINE:
-			statusIndex = 5;
-			break;
-
-		default:
-			std::cerr << "FriendListModel: Unknown status " << statusInfo.status << std::endl;
-		}
-
-		if (bestStatusIndex == 0 || statusIndex > bestStatusIndex) {
-			/* first status or better status */
-			bestStatusIndex = statusIndex;
-			bestNodeInformation = &nodeInformation;
-
-			if (status) {
-				*status = statusInfo.status;
-			}
-		}
-	}
-
-	if (bestStatusIndex == 0) {
-		return NULL;
-	}
-
-	return bestNodeInformation;
-}
-
 QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) const
 {
     if(col > 0)
@@ -996,42 +902,13 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
     {
         if(!isProfileExpanded(entry))
 		{
-			QPixmap sslAvatar;
-			bool foundAvatar = false;
+			QPixmap sslAvatar = FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE);
+
         	const HierarchicalProfileInformation *hn = getProfileInfo(entry);
-			uint32_t status = RS_STATUS_OFFLINE;
-			const HierarchicalNodeInformation *bestNodeInformation = NULL;
 
-			if (mDisplayStatusIcon) {
-				bestNodeInformation = getBestNodeInformation(hn, &status);
-				if (bestNodeInformation) {
-					if (AvatarDefs::getAvatarFromSslId(RsPeerId(bestNodeInformation->node_info.id.toStdString()), sslAvatar, "")) {
-						/* Use avatar from best node */
-						foundAvatar = true;
-					}
-				}
-			}
-
-			if (!foundAvatar) {
-				/* Use first available avatar */
-				for(uint32_t i=0;i<hn->child_node_indices.size();++i) {
-					if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar, "")) {
-						foundAvatar = true;
-						break;
-					}
-				}
-			}
-
-			if (!foundAvatar || sslAvatar.isNull()) {
-				sslAvatar = FilesDefs::getPixmapFromQtResourcePath(AVATAR_DEFAULT_IMAGE);
-			}
-
-			if (mDisplayStatusIcon) {
-				if (bestNodeInformation) {
-					QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(status));
-					return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
-				}
-			}
+			for(uint32_t i=0;i<hn->child_node_indices.size();++i)
+				if(AvatarDefs::getAvatarFromSslId(RsPeerId(mLocations[hn->child_node_indices[i]].node_info.id.toStdString()), sslAvatar))
+					return QVariant(QIcon(sslAvatar));
 
             return QVariant(QIcon(sslAvatar));
 		}
@@ -1048,10 +925,6 @@ QVariant RsFriendListModel::decorationRole(const EntryIndex& entry,int col) cons
 
 		QPixmap sslAvatar;
 		AvatarDefs::getAvatarFromSslId(RsPeerId(hn->node_info.id.toStdString()), sslAvatar);
-		if (mDisplayStatusIcon) {
-			QPixmap sslOverlayIcon = FilesDefs::getPixmapFromQtResourcePath(StatusDefs::imageStatus(statusRole(entry, col).toInt()));
-			return QVariant(QIcon(createAvatar(sslAvatar, sslOverlayIcon)));
-		}
 
         return QVariant(QIcon(sslAvatar));
     }
diff --git a/retroshare-gui/src/gui/common/FriendListModel.h b/retroshare-gui/src/gui/common/FriendListModel.h
index e19a84f04..646159377 100644
--- a/retroshare-gui/src/gui/common/FriendListModel.h
+++ b/retroshare-gui/src/gui/common/FriendListModel.h
@@ -129,10 +129,6 @@ public:
 
 	void setDisplayStatusString(bool b);
     bool getDisplayStatusString() const { return mDisplayStatusString; }
-	void setDisplayStatusIcon(bool b);
-	bool getDisplayStatusIcon() const { return mDisplayStatusIcon; }
-
-
 
     EntryType getType(const QModelIndex&) const;
 
@@ -223,14 +219,11 @@ private:
 
 	uint32_t updateFilterStatus(ForumModelIndex i,int column,const QStringList& strings);
 
-	const HierarchicalNodeInformation *getBestNodeInformation(const HierarchicalProfileInformation *profileInfo, uint32_t *status = NULL) const;
-
     QStringList mFilterStrings;
     FilterType  mFilterType;
 
     bool mDisplayGroups ;
     bool mDisplayStatusString ;
-    bool mDisplayStatusIcon ;
     rstime_t mLastInternalDataUpdate;
     rstime_t mLastNodeUpdate;;
 
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
index d9fc4b8dc..2e91ded27 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
@@ -127,7 +127,7 @@ FriendSelectionWidget::FriendSelectionWidget(QWidget *parent)
 	ui->filterLineEdit->showFilterIcon();
 
 	/* Refresh style to have the correct text color */
-	RsApplication::refreshStyleSheet(this, false);
+	Rshare::refreshStyleSheet(this, false);
 
     mEventHandlerId_identities = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) {
@@ -135,8 +135,6 @@ FriendSelectionWidget::FriendSelectionWidget(QWidget *parent)
     mEventHandlerId_peers = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) {
         RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }) ;}, mEventHandlerId_peers, RsEventType::PEER_CONNECTION );
-
-    mFontSizeHandler.registerFontSize(ui->friendList);
 }
 
 void FriendSelectionWidget::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
@@ -1227,7 +1225,7 @@ std::string FriendSelectionWidget::idFromItem(QTreeWidgetItem *item)
 	return item->data(COLUMN_DATA, ROLE_ID).toString().toStdString();
 }
 
-void FriendSelectionWidget::sortByChecked(bool)
+void FriendSelectionWidget::sortByChecked(bool sort)
 {
     mCompareRole->clear();
     mCompareRole->setRole(COLUMN_NAME,ROLE_SORT_SELECTED);
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.h b/retroshare-gui/src/gui/common/FriendSelectionWidget.h
index 425e16774..f10a748fc 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.h
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.h
@@ -26,7 +26,6 @@
 
 #include "retroshare/rsevents.h"
 #include <gui/gxs/RsGxsUpdateBroadcastPage.h>
-#include "util/FontSizeHandler.h"
 
 namespace Ui {
 class FriendSelectionWidget;
@@ -179,8 +178,6 @@ private:
 
     std::set<std::string> mPreSelectedIds; // because loading of GxsIds is asynchroneous we keep selected Ids from the client in a list here and use it to initialize after loading them.
 
-    FontSizeHandler mFontSizeHandler;
-
     RsEventsHandlerId_t mEventHandlerId_identities;
     RsEventsHandlerId_t mEventHandlerId_peers;
 };
diff --git a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
index a9bc8b407..065c9013b 100644
--- a/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
+++ b/retroshare-gui/src/gui/common/FriendSelectionWidget.ui
@@ -38,6 +38,11 @@
        <height>0</height>
       </size>
      </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
      <property name="contextMenuPolicy">
       <enum>Qt::CustomContextMenu</enum>
      </property>
@@ -66,7 +71,7 @@
   <customwidget>
    <class>LineEditClear</class>
    <extends>QLineEdit</extends>
-   <header>gui/common/LineEditClear.h</header>
+   <header location="global">gui/common/LineEditClear.h</header>
   </customwidget>
   <customwidget>
    <class>RSTreeWidget</class>
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
index 43861c4c6..0597a652c 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
@@ -148,19 +148,7 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
 
 	connect(ui->distantSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(distantSearch())) ;
 
-	mFontSizeHandler.registerFontSize(ui->treeWidget, 1.8f, [this] (QAbstractItemView*, int fontSize) {
-		// Set new font size on all items
-		QTreeWidgetItemIterator it(ui->treeWidget);
-		while (*it) {
-			QTreeWidgetItem *item = *it;
-
-			QFont font = item->font(GTW_COLUMN_NAME);
-			font.setPointSize(fontSize);
-			item->setFont(GTW_COLUMN_NAME, font);
-
-			++it;
-		}
-	});
+	ui->treeWidget->setIconSize(QSize(H*1.8,H*1.8));
 }
 
 GroupTreeWidget::~GroupTreeWidget()
@@ -266,8 +254,8 @@ QTreeWidgetItem *GroupTreeWidget::addCategoryItem(const QString &name, const QIc
 	RSTreeWidgetItem *item = new RSTreeWidgetItem();
 	ui->treeWidget->addTopLevelItem(item);
 	// To get StyleSheet for Items
-//	ui->treeWidget->style()->unpolish(ui->treeWidget);
-//	ui->treeWidget->style()->polish(ui->treeWidget);
+	ui->treeWidget->style()->unpolish(ui->treeWidget);
+	ui->treeWidget->style()->polish(ui->treeWidget);
 
 	item->setText(GTW_COLUMN_NAME, name);
 	item->setData(GTW_COLUMN_DATA, ROLE_NAME, name);
@@ -402,7 +390,7 @@ void GroupTreeWidget::fillGroupItems(QTreeWidgetItem *categoryItem, const QList<
 		if (item == NULL) {
 			item = new RSTreeWidgetItem(compareRole);
 			item->setData(GTW_COLUMN_DATA, ROLE_ID, itemInfo.id);
-			item->setFont(GTW_COLUMN_NAME, ui->treeWidget->font());
+			item->setFont(GTW_COLUMN_DATA, ui->treeWidget->font());
 			//static_cast<RSTreeWidgetItem*>(item)->setNoDataAsLast(true); //Uncomment this to sort data with QVariant() always at end.
 			categoryItem->addChild(item);
 		}
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.h b/retroshare-gui/src/gui/common/GroupTreeWidget.h
index 4aadb1c51..b27c37014 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.h
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.h
@@ -25,7 +25,6 @@
 
 #include <QTreeWidgetItem>
 #include <QDateTime>
-#include "util/FontSizeHandler.h"
 
 class QToolButton;
 class RshareSettings;
@@ -164,7 +163,6 @@ private:
 
 	// Compare role used for each column
 	RSTreeWidgetItemCompareRole *compareRole;
-	FontSizeHandler mFontSizeHandler;
 
 	Ui::GroupTreeWidget *ui;
 };
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.ui b/retroshare-gui/src/gui/common/GroupTreeWidget.ui
index 10b5eb48b..d3e0a14a5 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.ui
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.ui
@@ -35,10 +35,10 @@
       </sizepolicy>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="leftMargin">
@@ -70,6 +70,11 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
      <property name="contextMenuPolicy">
       <enum>Qt::CustomContextMenu</enum>
      </property>
diff --git a/retroshare-gui/src/gui/common/LineEditClear.cpp b/retroshare-gui/src/gui/common/LineEditClear.cpp
index cf45bc75b..c3d68b512 100644
--- a/retroshare-gui/src/gui/common/LineEditClear.cpp
+++ b/retroshare-gui/src/gui/common/LineEditClear.cpp
@@ -24,7 +24,6 @@
 #include <QToolButton>
 #include <QStyle>
 #include <QMenu>
-#include <QActionGroup>
 //#if QT_VERSION < 0x040700
 #if QT_VERSION < 0x050000//PlaceHolder text only shown when not have focus in Qt4
 #include <QLabel>
@@ -235,10 +234,8 @@ void LineEditClear::setFilterButtonIcon(const QIcon &icon)
 		mFilterButton->setIcon(icon);
 
 	ensurePolished();
-#if !defined(Q_OS_DARWIN)
 	QFontMetrics fm(this->font());
 	QSize size(fm.width("___"), fm.height());
 	mFilterButton->setFixedSize(size);
 	mFilterButton->setIconSize(size);
-#endif
 }
diff --git a/retroshare-gui/src/gui/common/MacDockIconHandler.h b/retroshare-gui/src/gui/common/MacDockIconHandler.h
deleted file mode 100644
index d9d4d41f5..000000000
--- a/retroshare-gui/src/gui/common/MacDockIconHandler.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2011-2018 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef MACDOCKICONHANDLER_H
-#define MACDOCKICONHANDLER_H
-
-#include <QObject>
-
-/** macOS-specific Dock icon handler.
- */
-class MacDockIconHandler : public QObject
-{
-    Q_OBJECT
-
-public:
-    static MacDockIconHandler *instance();
-    static void cleanup();
-
-Q_SIGNALS:
-    void dockIconClicked();
-
-private:
-    MacDockIconHandler();
-};
-
-#endif // MACDOCKICONHANDLER_H
diff --git a/retroshare-gui/src/gui/common/MacDockIconHandler.mm b/retroshare-gui/src/gui/common/MacDockIconHandler.mm
deleted file mode 100644
index 51a26135d..000000000
--- a/retroshare-gui/src/gui/common/MacDockIconHandler.mm
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2011-2019 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include "MacDockIconHandler.h"
-
-#include <AppKit/AppKit.h>
-#include <objc/runtime.h>
-
-static MacDockIconHandler *s_instance = nullptr;
-
-bool dockClickHandler(id self, SEL _cmd, ...) {
-    Q_UNUSED(self)
-    Q_UNUSED(_cmd)
-
-    Q_EMIT s_instance->dockIconClicked();
-
-    // Return NO (false) to suppress the default macOS actions
-    return false;
-}
-
-void setupDockClickHandler() {
-    Class delClass = (Class)[[[NSApplication sharedApplication] delegate] class];
-    SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
-    class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:");
-}
-
-MacDockIconHandler::MacDockIconHandler() : QObject()
-{
-    setupDockClickHandler();
-}
-
-MacDockIconHandler *MacDockIconHandler::instance()
-{
-    if (!s_instance)
-        s_instance = new MacDockIconHandler();
-    return s_instance;
-}
-
-void MacDockIconHandler::cleanup()
-{
-    delete s_instance;
-}
-
-/**
- * Force application activation on macOS. With Qt 5.5.1 this is required when
- * an action in the Dock menu is triggered.
- * TODO: Define a Qt version where it's no-longer necessary.
- */
-void ForceActivation()
-{
-    [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
-}
diff --git a/retroshare-gui/src/gui/common/NewFriendList.cpp b/retroshare-gui/src/gui/common/NewFriendList.cpp
index 4ed25d951..bd6faec41 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.cpp
+++ b/retroshare-gui/src/gui/common/NewFriendList.cpp
@@ -54,7 +54,6 @@
 #include "gui/chat/ChatUserNotify.h"
 #include "gui/connect/ConnectProgressDialog.h"
 #include "gui/common/ElidedLabel.h"
-#include "gui/notifyqt.h"
 
 #include "NewFriendList.h"
 #include "ui_NewFriendList.h"
@@ -203,9 +202,6 @@ NewFriendList::NewFriendList(QWidget */*parent*/) : /* RsAutoUpdatePage(5000,par
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e) { handleEvent(e); }, mEventHandlerId_peer, RsEventType::PEER_CONNECTION );
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> e) { handleEvent(e); }, mEventHandlerId_gssp, RsEventType::GOSSIP_DISCOVERY );
 
-    connect(NotifyQt::getInstance(), SIGNAL(peerHasNewAvatar(QString)), this, SLOT(forceUpdateDisplay()));
-    connect(NotifyQt::getInstance(), SIGNAL(peerStatusChanged(QString,int)), this, SLOT(forceUpdateDisplay()));
-
     mModel = new RsFriendListModel(ui->peerTreeWidget);
 	mProxyModel = new FriendListSortFilterProxyModel(ui->peerTreeWidget->header(),this);
 
@@ -265,7 +261,6 @@ NewFriendList::NewFriendList(QWidget */*parent*/) : /* RsAutoUpdatePage(5000,par
 
     connect(ui->actionShowOfflineFriends, SIGNAL(triggered(bool)), this, SLOT(setShowUnconnected(bool)));
     connect(ui->actionShowState,          SIGNAL(triggered(bool)), this, SLOT(setShowState(bool))      );
-    connect(ui->actionShowStateIcon,      SIGNAL(triggered(bool)), this, SLOT(setShowStateIcon(bool))      );
     connect(ui->actionShowGroups,         SIGNAL(triggered(bool)), this, SLOT(setShowGroups(bool))     );
     connect(ui->actionExportFriendlist,   SIGNAL(triggered())    , this, SLOT(exportFriendlistClicked()));
     connect(ui->actionImportFriendlist,   SIGNAL(triggered())    , this, SLOT(importFriendlistClicked()));
@@ -273,8 +268,6 @@ NewFriendList::NewFriendList(QWidget */*parent*/) : /* RsAutoUpdatePage(5000,par
     connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterItems(QString)),Qt::QueuedConnection);
 	connect(h, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(headerContextMenuRequested(QPoint)));
 
-    mFontSizeHandler.registerFontSize(ui->peerTreeWidget,1.5f);
-
 // #ifdef RS_DIRECT_CHAT
 // 	connect(ui->peerTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(chatNode()));
 // #endif
@@ -348,12 +341,10 @@ void NewFriendList::headerContextMenuRequested(QPoint /*p*/)
 
     displayMenu.addAction(ui->actionShowOfflineFriends);
     displayMenu.addAction(ui->actionShowState);
-    displayMenu.addAction(ui->actionShowStateIcon);
     displayMenu.addAction(ui->actionShowGroups);
 
     ui->actionShowOfflineFriends->setChecked(mProxyModel->showOfflineNodes());
     ui->actionShowState->setChecked(mModel->getDisplayStatusString());
-    ui->actionShowStateIcon->setChecked(mModel->getDisplayStatusIcon());
     ui->actionShowGroups->setChecked(mModel->getDisplayGroups());
 
     QHeaderView *header = ui->peerTreeWidget->header();
@@ -514,8 +505,6 @@ void NewFriendList::processSettings(bool load)
 
         mModel->setDisplayStatusString(Settings->value("showState", mModel->getDisplayStatusString()).toBool());
         mModel->setDisplayGroups(Settings->value("showGroups", mModel->getDisplayGroups()).toBool());
-        mModel->setDisplayStatusIcon(Settings->value("showStateIcon", mModel->getDisplayStatusIcon()).toBool());
-
 
         setColumnVisible(RsFriendListModel::COLUMN_THREAD_IP,Settings->value("showIP", isColumnVisible(RsFriendListModel::COLUMN_THREAD_IP)).toBool());
         setColumnVisible(RsFriendListModel::COLUMN_THREAD_ID,Settings->value("showID", isColumnVisible(RsFriendListModel::COLUMN_THREAD_ID)).toBool());
@@ -539,8 +528,6 @@ void NewFriendList::processSettings(bool load)
         Settings->setValue("hideUnconnected", !mProxyModel->showOfflineNodes());
         Settings->setValue("showState", mModel->getDisplayStatusString());
         Settings->setValue("showGroups", mModel->getDisplayGroups());
-        Settings->setValue("showStateIcon", mModel->getDisplayStatusIcon());
-
 
         Settings->setValue("showIP",isColumnVisible(RsFriendListModel::COLUMN_THREAD_IP));
         Settings->setValue("showID",isColumnVisible(RsFriendListModel::COLUMN_THREAD_ID));
@@ -1656,12 +1643,6 @@ void NewFriendList::setShowState(bool show)
     processSettings(false);
 }
 
-void NewFriendList::setShowStateIcon(bool show)
-{
-    applyWhileKeepingTree([show,this]() { mModel->setDisplayStatusIcon(show) ; });
-    processSettings(false);
-}
-
 void NewFriendList::setShowGroups(bool show)
 {
     applyWhileKeepingTree([show,this]() { mModel->setDisplayGroups(show) ; });
@@ -1673,7 +1654,7 @@ void NewFriendList::setShowGroups(bool show)
  */
 void NewFriendList::filterItems(const QString &text)
 {
-    QStringList lst = text.split(' ',QtSkipEmptyParts);
+    QStringList lst = text.split(' ',QString::SkipEmptyParts);
 	int filterColumn = ui->filterLineEdit->currentFilter();
 
     if(filterColumn == 0)
diff --git a/retroshare-gui/src/gui/common/NewFriendList.h b/retroshare-gui/src/gui/common/NewFriendList.h
index cf4c68e6f..cf2e892b3 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.h
+++ b/retroshare-gui/src/gui/common/NewFriendList.h
@@ -29,7 +29,6 @@
 
 #include "FriendListModel.h"
 #include "retroshare/rsstatus.h"
-#include "util/FontSizeHandler.h"
 
 namespace Ui {
     class NewFriendList;
@@ -88,9 +87,7 @@ public slots:
 	void setShowGroups(bool show);
 	void setShowUnconnected(bool hidden);
 	void setShowState(bool show);
-	void setShowStateIcon(bool show);
-	void headerContextMenuRequested(QPoint);
-	void exportFriendlistClicked();
+    void headerContextMenuRequested(QPoint);
 
 private slots:
 	void sortColumn(int col,Qt::SortOrder so);
@@ -105,7 +102,6 @@ private:
 	Ui::NewFriendList *ui;
 	RsFriendListModel *mModel;
 	QAction *mActionSortByState;
-	FontSizeHandler mFontSizeHandler;
 
     void applyWhileKeepingTree(std::function<void()> predicate);
 
@@ -168,5 +164,6 @@ private slots:
 	void editGroup();
 	void removeGroup();
 
+	void exportFriendlistClicked();
 	void importFriendlistClicked();
 };
diff --git a/retroshare-gui/src/gui/common/NewFriendList.ui b/retroshare-gui/src/gui/common/NewFriendList.ui
index 286cf4304..20ae02eb2 100644
--- a/retroshare-gui/src/gui/common/NewFriendList.ui
+++ b/retroshare-gui/src/gui/common/NewFriendList.ui
@@ -29,10 +29,10 @@
    <item>
     <widget class="QFrame" name="toolBarFrame">
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QHBoxLayout" name="toolBarFrame_HL">
       <property name="spacing">
@@ -58,6 +58,11 @@
    </item>
    <item>
     <widget class="QTreeView" name="peerTreeWidget">
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+      </font>
+     </property>
      <property name="contextMenuPolicy">
       <enum>Qt::CustomContextMenu</enum>
      </property>
@@ -119,17 +124,6 @@
     <string>import your friendlist including groups</string>
    </property>
   </action>
-  <action name="actionShowStateIcon">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Status icons</string>
-   </property>
-   <property name="toolTip">
-    <string>Show status icons</string>
-   </property>
-  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/retroshare-gui/src/gui/common/RSTreeWidget.cpp b/retroshare-gui/src/gui/common/RSTreeWidget.cpp
index 8ecdfde3f..7e3a8b216 100644
--- a/retroshare-gui/src/gui/common/RSTreeWidget.cpp
+++ b/retroshare-gui/src/gui/common/RSTreeWidget.cpp
@@ -27,7 +27,6 @@
 #include <QMouseEvent>
 #include <QPainter>
 #include <QWidgetAction>
-#include <QActionGroup>
 
 #include "gui/settings/rsharesettings.h"
 #include "gui/common/FilesDefs.h"
diff --git a/retroshare-gui/src/gui/common/RsButtonOnText.cpp b/retroshare-gui/src/gui/common/RsButtonOnText.cpp
index 8774f84bd..95466c9d4 100644
--- a/retroshare-gui/src/gui/common/RsButtonOnText.cpp
+++ b/retroshare-gui/src/gui/common/RsButtonOnText.cpp
@@ -107,7 +107,7 @@ bool RSButtonOnText::eventFilter(QObject *obj, QEvent *event)
 		}
 		if (event->type() == QEvent::MouseButtonPress)	{
 			QMouseEvent* mouseEvent = new QMouseEvent(QEvent::MouseButtonPress
-			                                          ,QPoint(1,1),Qt::LeftButton,Qt::LeftButton,Qt::KeyboardModifier::NoModifier);
+			                                          ,QPoint(1,1),Qt::LeftButton,Qt::LeftButton,0);
 			QPushButton::mousePressEvent(mouseEvent);
 			delete mouseEvent;
             if (guard) _pressed = true;
@@ -116,7 +116,7 @@ bool RSButtonOnText::eventFilter(QObject *obj, QEvent *event)
 		}
 		if (event->type() == QEvent::MouseButtonRelease)	{
 			QMouseEvent* mouseEvent = new QMouseEvent(QEvent::MouseButtonPress
-			                                          ,QPoint(1,1),Qt::LeftButton,Qt::LeftButton,Qt::KeyboardModifier::NoModifier);
+			                                          ,QPoint(1,1),Qt::LeftButton,Qt::LeftButton,0);
 			QPushButton::mouseReleaseEvent(mouseEvent);
 			delete mouseEvent;
             if (guard) _pressed = false;
@@ -152,7 +152,7 @@ bool RSButtonOnText::eventFilter(QObject *obj, QEvent *event)
 			}
 			if (_pressed){
 				QMouseEvent* mouseEvent = new QMouseEvent(QEvent::MouseButtonPress
-				                                          ,QPoint(1,1),Qt::LeftButton,Qt::LeftButton,Qt::KeyboardModifier::NoModifier);
+				                                          ,QPoint(1,1),Qt::LeftButton,Qt::LeftButton,0);
 				QPushButton::mouseReleaseEvent(mouseEvent);
 				delete mouseEvent;
 				//if (guard) emit released();
diff --git a/retroshare-gui/src/gui/common/RsCollection.cpp b/retroshare-gui/src/gui/common/RsCollection.cpp
index e13452038..c49296503 100644
--- a/retroshare-gui/src/gui/common/RsCollection.cpp
+++ b/retroshare-gui/src/gui/common/RsCollection.cpp
@@ -37,411 +37,534 @@
 
 const QString RsCollection::ExtensionString = QString("rscollection") ;
 
-RsCollection::RsCollection()
+RsCollection::RsCollection(QObject *parent)
+	: QObject(parent), _xml_doc("RsCollection")
 {
-    mFileTree = std::unique_ptr<RsFileTree>(new RsFileTree());
-}
-RsCollection::RsCollection(const RsFileTree& ft)
-{
-    mFileTree = std::unique_ptr<RsFileTree>(new RsFileTree(ft));
-
-    for(uint64_t i=0;i<mFileTree->numFiles();++i)
-        mHashes.insert(std::make_pair(mFileTree->fileData(i).hash,i ));
+	_root = _xml_doc.createElement("RsCollection");
+	_xml_doc.appendChild(_root);
 }
 
-RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchFlags flags)
-    : mFileTree(new RsFileTree)
+RsCollection::RsCollection(const RsFileTree& fr)
+	: _xml_doc("RsCollection")
 {
-    if(! ( (flags & RS_FILE_HINTS_LOCAL) || (flags & RS_FILE_HINTS_REMOTE)))
-    {
-        std::cerr << "(EE) Wrong flags passed to RsCollection constructor. Please fix the code!" << std::endl;
-        return ;
-    }
+	_root = _xml_doc.createElement("RsCollection");
+	_xml_doc.appendChild(_root);
 
-    for(uint32_t i = 0;i<file_infos.size();++i)
-        recursAddElements(mFileTree->root(),file_infos[i],flags) ;
+	recursAddElements(_xml_doc,fr,0,_root) ;
+}
 
-    for(uint64_t i=0;i<mFileTree->numFiles();++i)
-        mHashes.insert(std::make_pair(mFileTree->fileData(i).hash,i ));
+RsCollection::RsCollection(const std::vector<DirDetails>& file_infos,FileSearchFlags flags, QObject *parent)
+	: QObject(parent), _xml_doc("RsCollection")
+{
+	_root = _xml_doc.createElement("RsCollection");
+	_xml_doc.appendChild(_root);
+
+	if(! ( (flags & RS_FILE_HINTS_LOCAL) || (flags & RS_FILE_HINTS_REMOTE)))
+	{
+		std::cerr << "(EE) Wrong flags passed to RsCollection constructor. Please fix the code!" << std::endl;
+		return ;
+	}
+
+	for(uint32_t i = 0;i<file_infos.size();++i)
+		recursAddElements(_xml_doc,file_infos[i],_root,flags) ;
 }
 
 RsCollection::~RsCollection()
 {
 }
 
+void RsCollection::downloadFiles() const
+{
+	// print out the element names of all elements that are direct children
+	// of the outermost element.
+	QDomElement docElem = _xml_doc.documentElement();
+
+	std::vector<ColFileInfo> colFileInfos ;
+
+	recursCollectColFileInfos(docElem,colFileInfos,QString(),false) ;
+
+	RsCollectionDialog(_fileName, colFileInfos, false).exec() ;
+}
+
+void RsCollection::autoDownloadFiles() const
+{
+	QDomElement docElem = _xml_doc.documentElement();
+
+	std::vector<ColFileInfo> colFileInfos;
+
+	recursCollectColFileInfos(docElem,colFileInfos,QString(),false);
+
+	QString dlDir = QString::fromUtf8(rsFiles->getDownloadDirectory().c_str());
+
+	foreach(ColFileInfo colFileInfo, colFileInfos)
+	{
+		autoDownloadFiles(colFileInfo, dlDir);
+	}
+}
+
 void RsCollection::autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const
 {
-    if (!colFileInfo.filename_has_wrong_characters)
-    {
-        QString cleanPath = dlDir + colFileInfo.path ;
-        std::cout << "making directory " << cleanPath.toStdString() << std::endl;
+	if (!colFileInfo.filename_has_wrong_characters)
+	{
+		QString cleanPath = dlDir + colFileInfo.path ;
+		std::cout << "making directory " << cleanPath.toStdString() << std::endl;
 
-        if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath))
-            std::cerr << "Unable to make path: " + cleanPath.toStdString() << std::endl;
+		if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath))
+			std::cerr << "Unable to make path: " + cleanPath.toStdString() << std::endl;
 
-        if (colFileInfo.type==DIR_TYPE_FILE)
-            rsFiles->FileRequest(colFileInfo.name.toUtf8().constData(),
-                                 RsFileHash(colFileInfo.hash.toStdString()),
-                                 colFileInfo.size,
-                                 cleanPath.toUtf8().constData(),
-                                 RS_FILE_REQ_ANONYMOUS_ROUTING,
-                                 std::list<RsPeerId>());
-    }
-    foreach(ColFileInfo colFileInfoChild, colFileInfo.children)
-    {
-        autoDownloadFiles(colFileInfoChild, dlDir);
-    }
+		if (colFileInfo.type==DIR_TYPE_FILE)
+			rsFiles->FileRequest(colFileInfo.name.toUtf8().constData(),
+			                     RsFileHash(colFileInfo.hash.toStdString()),
+			                     colFileInfo.size,
+			                     cleanPath.toUtf8().constData(),
+			                     RS_FILE_REQ_ANONYMOUS_ROUTING,
+			                     std::list<RsPeerId>());
+	}
+	foreach(ColFileInfo colFileInfoChild, colFileInfo.children)
+	{
+		autoDownloadFiles(colFileInfoChild, dlDir);
+	}
 }
 
 static QString purifyFileName(const QString& input,bool& bad)
 {
-    static const QString bad_chars = "/\\\"*:?<>|" ;
-    bad = false ;
-    QString output = input ;
+	static const QString bad_chars = "/\\\"*:?<>|" ;
+	bad = false ;
+	QString output = input ;
 
-    for(int i=0;i<output.length();++i)
-        for(int j=0;j<bad_chars.length();++j)
-            if(output[i] == bad_chars[j])
-            {
-                output[i] = '_' ;
-                bad = true ;
-            }
+	for(int i=0;i<output.length();++i)
+		for(int j=0;j<bad_chars.length();++j)
+			if(output[i] == bad_chars[j])
+			{
+				output[i] = '_' ;
+				bad = true ;
+			}
 
-    return output ;
+	return output ;
 }
 
-void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash,RsFileTree::DirIndex parent_index)
+void RsCollection::merge_in(const QString& fname,uint64_t size,const RsFileHash& hash)
 {
-    mHashes[hash]= mFileTree->addFile(parent_index,fname.toStdString(),hash,size);
+	ColFileInfo info ;
+	info.type = DIR_TYPE_FILE ;
+	info.name = fname ;
+	info.size = size ;
+	info.hash = QString::fromStdString(hash.toStdString()) ;
+
+	recursAddElements(_xml_doc,info,_root) ;
 }
-void RsCollection::merge_in(const RsFileTree& tree, RsFileTree::DirIndex parent_index)
+void RsCollection::merge_in(const RsFileTree& tree)
 {
-    recursMergeTree(mFileTree->root(),tree,tree.directoryData(parent_index)) ;
+	recursAddElements(_xml_doc,tree,0,_root) ;
 }
 
-void RsCollection::recursMergeTree(RsFileTree::DirIndex parent,const RsFileTree& tree,const RsFileTree::DirData& dd)
+void RsCollection::recursCollectColFileInfos(const QDomElement& e,std::vector<ColFileInfo>& colFileInfos,const QString& current_path, bool bad_chars_in_parent) const
 {
-    for(uint32_t i=0;i<dd.subfiles.size();++i)
-    {
-        const RsFileTree::FileData& fd(tree.fileData(dd.subfiles[i]));
-        mHashes[fd.hash] = mFileTree->addFile(parent,fd.name,fd.hash,fd.size);
-    }
-    for(uint32_t i=0;i<dd.subdirs.size();++i)
-    {
-        const RsFileTree::DirData& ld(tree.directoryData(dd.subdirs[i]));
+	QDomNode n = e.firstChild() ;
+#ifdef COLLECTION_DEBUG
+	std::cerr << "Parsing element " << e.tagName().toStdString() << std::endl;
+#endif
 
-        auto new_dir_index = mFileTree->addDirectory(parent,ld.name);
-        recursMergeTree(new_dir_index,tree,ld);
-    }
+	while(!n.isNull()) 
+	{
+		QDomElement ee = n.toElement(); // try to convert the node to an element.
+
+#ifdef COLLECTION_DEBUG
+		std::cerr << "  Seeing child " << ee.tagName().toStdString() << std::endl;
+#endif
+
+		if(ee.tagName() == QString("File"))
+		{
+			ColFileInfo newChild ;
+			newChild.hash = ee.attribute(QString("sha1")) ;
+			bool bad_chars_detected = false ;
+			newChild.name = purifyFileName(ee.attribute(QString("name")), bad_chars_detected) ;
+			newChild.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
+			newChild.size = ee.attribute(QString("size")).toULongLong() ;
+			newChild.path = current_path ;
+			newChild.type = DIR_TYPE_FILE ;
+
+			colFileInfos.push_back(newChild) ;
+		}
+		else if(ee.tagName() == QString("Directory"))
+		{
+			ColFileInfo newParent ;
+			bool bad_chars_detected = false ;
+			QString cleanDirName = purifyFileName(ee.attribute(QString("name")),bad_chars_detected) ;
+			newParent.name=cleanDirName;
+			newParent.filename_has_wrong_characters = bad_chars_detected || bad_chars_in_parent ;
+			newParent.size = 0;
+			newParent.path = current_path ;
+			newParent.type = DIR_TYPE_DIR ;
+
+			recursCollectColFileInfos(ee,newParent.children,current_path + "/" + cleanDirName, bad_chars_in_parent || bad_chars_detected) ;
+			uint32_t size = newParent.children.size();
+			for(uint32_t i=0;i<size;++i)
+			{
+				const ColFileInfo &colFileInfo = newParent.children[i];
+				newParent.size +=colFileInfo.size ;
+			}
+
+			colFileInfos.push_back(newParent) ;
+		}
+
+		n = n.nextSibling() ;
+	}
 }
 
-void RsCollection::recursAddElements(RsFileTree::DirIndex parent, const DirDetails& dd, FileSearchFlags flags)
+
+void RsCollection::recursAddElements(QDomDocument& doc,const DirDetails& details,QDomElement& e,FileSearchFlags flags) const
 {
-    if (dd.type == DIR_TYPE_FILE)
-        mHashes[dd.hash] = mFileTree->addFile(parent,dd.name,dd.hash,dd.size);
-    else if (dd.type == DIR_TYPE_DIR)
-    {
-        RsFileTree::DirIndex new_dir_index = mFileTree->addDirectory(parent,dd.name);
+	if (details.type == DIR_TYPE_FILE)
+	{
+		QDomElement f = doc.createElement("File") ;
 
-        for(uint32_t i=0;i<dd.children.size();++i)
-        {
-            if (!dd.children[i].ref)
-                continue;
+		f.setAttribute(QString("name"),QString::fromUtf8(details.name.c_str())) ;
+        f.setAttribute(QString("sha1"),QString::fromStdString(details.hash.toStdString())) ;
+        f.setAttribute(QString("size"),QString::number(details.size)) ;
 
-            DirDetails subDirDetails;
+		e.appendChild(f) ;
+	}
+	else if (details.type == DIR_TYPE_DIR)
+	{
+		QDomElement d = doc.createElement("Directory") ;
 
-            if (!rsFiles->RequestDirDetails(dd.children[i].ref, subDirDetails, flags))
-                continue;
+		d.setAttribute(QString("name"),QString::fromUtf8(details.name.c_str())) ;
 
-            recursAddElements(new_dir_index,subDirDetails,flags) ;
-        }
-    }
+        for(uint32_t i=0;i<details.children.size();++i)
+		{
+            if (!details.children[i].ref)
+				continue;
+
+			DirDetails subDirDetails;
+
+            if (!rsFiles->RequestDirDetails(details.children[i].ref, subDirDetails, flags))
+				continue;
+
+			recursAddElements(doc,subDirDetails,d,flags) ;
+		}
+
+		e.appendChild(d) ;
+	}
 }
 
-QString RsCollection::errorString(RsCollectionErrorCode code)
+void RsCollection::recursAddElements(QDomDocument& doc,const ColFileInfo& colFileInfo,QDomElement& e) const
 {
-    switch(code)
-    {
-    default: [[fallthrough]] ;
-    case RsCollectionErrorCode::UNKNOWN_ERROR:                 return QObject::tr("Unknown error");
-    case RsCollectionErrorCode::COLLECTION_NO_ERROR:           return QObject::tr("No error");
-    case RsCollectionErrorCode::FILE_READ_ERROR:               return QObject::tr("Error while openning file");
-    case RsCollectionErrorCode::FILE_CONTAINS_HARMFUL_STRINGS: return QObject::tr("Collection file contains potentially harmful code");
-    case RsCollectionErrorCode::INVALID_ROOT_NODE:             return QObject::tr("Invalid root node. RsCollection node was expected.");
-    case RsCollectionErrorCode::XML_PARSING_ERROR:             return QObject::tr("XML parsing error in collection file");
-    }
+	if (colFileInfo.type == DIR_TYPE_FILE)
+	{
+		QDomElement f = doc.createElement("File") ;
+
+		f.setAttribute(QString("name"),colFileInfo.name) ;
+		f.setAttribute(QString("sha1"),colFileInfo.hash) ;
+		f.setAttribute(QString("size"),QString::number(colFileInfo.size)) ;
+
+		e.appendChild(f) ;
+	}
+	else if (colFileInfo.type == DIR_TYPE_DIR)
+	{
+		QDomElement d = doc.createElement("Directory") ;
+
+		d.setAttribute(QString("name"),colFileInfo.name) ;
+
+		for (std::vector<ColFileInfo>::const_iterator it = colFileInfo.children.begin(); it != colFileInfo.children.end(); ++it)
+			recursAddElements(doc,(*it),d) ;
+
+		e.appendChild(d) ;
+	}
 }
 
-RsCollection::RsCollection(const RsCollection& col)
-    : mFileTree(new RsFileTree(*col.mFileTree)),mHashes(col.mHashes)
+void RsCollection::recursAddElements(
+        QDomDocument& doc, const RsFileTree& ft, uint32_t index,
+        QDomElement& e ) const
 {
+	std::vector<uint64_t> subdirs;
+	std::vector<RsFileTree::FileData> subfiles ;
+	std::string name;
+	if(!ft.getDirectoryContent(name, subdirs, subfiles, index)) return;
+
+	QDomElement d = doc.createElement("Directory") ;
+	d.setAttribute(QString("name"),QString::fromUtf8(name.c_str())) ;
+	e.appendChild(d) ;
+
+	for (uint32_t i=0;i<subdirs.size();++i)
+		recursAddElements(doc,ft,subdirs[i],d) ;
+
+	for(uint32_t i=0;i<subfiles.size();++i)
+	{
+		QDomElement f = doc.createElement("File") ;
+
+		f.setAttribute(QString("name"),QString::fromUtf8(subfiles[i].name.c_str())) ;
+		f.setAttribute(QString("sha1"),QString::fromStdString(subfiles[i].hash.toStdString())) ;
+		f.setAttribute(QString("size"),QString::number(subfiles[i].size)) ;
+
+		d.appendChild(f) ;
+	}
 }
 
-RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error)
-    : mFileTree(new RsFileTree)
+static void showErrorBox(const QString& fileName, const QString& error)
 {
-    if (!checkFile(fileName,error))
-        return ;
-
-    QFile file(fileName);
-
-    if (!file.open(QIODevice::ReadOnly))
-    {
-        std::cerr << "Cannot open file " << fileName.toStdString() << " !!" << std::endl;
-        error = RsCollectionErrorCode::FILE_READ_ERROR;
-        //showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(fileName));
-        return ;
-    }
-
-    QDomDocument xml_doc;
-    bool ok = xml_doc.setContent(&file) ;
-
-    if(!ok)
-    {
-        error = RsCollectionErrorCode::XML_PARSING_ERROR;
-        return;
-    }
-    file.close();
-
-    QDomNode root = xml_doc.elementsByTagName("RsCollection").at(0).toElement();
-
-    if(root.isNull())
-    {
-        error = RsCollectionErrorCode::INVALID_ROOT_NODE;
-        return;
-    }
-
-    if(!recursParseXml(xml_doc,root,0))
-        error = RsCollectionErrorCode::XML_PARSING_ERROR;
-    else
-        error = RsCollectionErrorCode::COLLECTION_NO_ERROR;
+	QMessageBox mb(QMessageBox::Warning, QObject::tr("Failed to process collection file"), QObject::tr("The collection file %1 could not be opened.\nReported error is: \n\n%2").arg(fileName).arg(error), QMessageBox::Ok);
+	mb.exec();
 }
 
-// check that the file is a valid rscollection file, and not a lol bomb or some shit like this
-
-bool RsCollection::checkFile(const QString& fileName, RsCollectionErrorCode& error)
+bool RsCollection::load(const QString& fileName, bool showError /* = true*/)
 {
-    QFile file(fileName);
-    error = RsCollectionErrorCode::COLLECTION_NO_ERROR;
 
-    if (!file.open(QIODevice::ReadOnly))
-    {
-        std::cerr << "Cannot open file " << fileName.toStdString() << " !!" << std::endl;
-        error = RsCollectionErrorCode::FILE_READ_ERROR;
+	if (!checkFile(fileName,showError)) return false;
+	QFile file(fileName);
 
-        //showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(fileName));
-        return false;
-    }
-    if (file.reset()){
-        std::cerr << "Checking this file for bomb elements and various wrong stuff" << std::endl;
-        char c ;
+	if (!file.open(QIODevice::ReadOnly))
+	{
+		std::cerr << "Cannot open file " << fileName.toStdString() << " !!" << std::endl;
+		if (showError) {
+			showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(fileName));
+		}
+		return false;
+	}
 
-        std::vector<std::string> bad_strings ;
-        bad_strings.push_back(std::string("<!entity ")) ;
-        static const int max_size = 12 ; // should be as large as the largest element in bad_strings
-        char current[max_size] = { 0,0,0,0,0,0,0,0,0,0,0,0 } ;
-        int n=0 ;
+	bool ok = _xml_doc.setContent(&file) ;
+	file.close();
 
-        while( !file.atEnd() || n >= 0)
-        {
-            if (!file.atEnd())
-                file.getChar(&c);
-            else
-                c=0;
+	if (ok) {
+		_fileName = fileName;
+	} else {
+		if (showError) {
+			showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Error parsing xml file"));
+		}
+	}
 
-            if(c == '\t' || c == '\n' || c == '\b' || c == '\r')
-                continue ;
+	return ok;
+}
 
-            if (n == max_size || file.atEnd())
-                for(int i=0;i<n-1;++i)
-                    current[i] = current[i+1] ;
+	// check that the file is a valid rscollection file, and not a lol bomb or some shit like this
+bool RsCollection::checkFile(const QString& fileName, bool showError)
+{
+	QFile file(fileName);
 
-            if(n == max_size)
-                --n ;
+	if (!file.open(QIODevice::ReadOnly))
+	{
+		std::cerr << "Cannot open file " << fileName.toStdString() << " !!" << std::endl;
+		if (showError) {
+			showErrorBox(fileName, QApplication::translate("RsCollectionFile", "Cannot open file %1").arg(fileName));
+		}
+		return false;
+	}
+	if (file.reset()){
+	std::cerr << "Checking this file for bomb elements and various wrong stuff" << std::endl;
+	char c ;
 
-            if(c >= 'A' && c <= 'Z') c += 'a' - 'A' ;
+	std::vector<std::string> bad_strings ;
+	bad_strings.push_back(std::string("<!entity ")) ;
+	static const int max_size = 12 ; // should be as large as the largest element in bad_strings
+	char current[max_size] = { 0,0,0,0,0,0,0,0,0,0,0,0 } ;
+	int n=0 ;
 
-            if(!file.atEnd())
-                current[n] = c ;
-            else
-                current[n] = 0 ;
+		while( !file.atEnd() || n >= 0)
+	{
+			if (!file.atEnd())
+				file.getChar(&c);
+			else
+				c=0;
 
-            //std::cerr << "n==" << n <<" Checking string " << std::string(current,n+1)  << " c = " << std::hex << (int)c << std::dec << std::endl;
+		if(c == '\t' || c == '\n' || c == '\b' || c == '\r')
+			continue ;
 
-            for(uint i=0;i<bad_strings.size();++i)
-                if(std::string(current,bad_strings[i].length()) == bad_strings[i])
-                {
-                    //showErrorBox(file.fileName(), QApplication::translate("RsCollectionFile", "This file contains the string \"%1\" and is therefore an invalid collection file. \n\nIf you believe it is correct, remove the corresponding line from the file and re-open it with Retroshare.").arg(bad_strings[i].c_str()));
-                    error = RsCollectionErrorCode::FILE_CONTAINS_HARMFUL_STRINGS;
-                    file.close();
-                    return false ;
-                    //std::cerr << "Bad string detected" << std::endl;
-                }
+		if (n == max_size || file.atEnd())
+			for(int i=0;i<n-1;++i)
+				current[i] = current[i+1] ;
 
-            if(file.atEnd())
-                n-- ;
-            else if(n < max_size)
-                ++n ;
-        }
-        file.close();
-        return true;
-    }
-    error = RsCollectionErrorCode::UNKNOWN_ERROR;
-    return false;
+		if(n == max_size)
+			--n ;
+
+		if(c >= 'A' && c <= 'Z') c += 'a' - 'A' ;
+
+			if(!file.atEnd())
+			current[n] = c ;
+		else
+			current[n] = 0 ;
+
+		//std::cerr << "n==" << n <<" Checking string " << std::string(current,n+1)  << " c = " << std::hex << (int)c << std::dec << std::endl;
+
+			for(uint i=0;i<bad_strings.size();++i)
+			if(std::string(current,bad_strings[i].length()) == bad_strings[i])
+			{
+					showErrorBox(file.fileName(), QApplication::translate("RsCollectionFile", "This file contains the string \"%1\" and is therefore an invalid collection file. \n\nIf you believe it is correct, remove the corresponding line from the file and re-open it with Retroshare.").arg(bad_strings[i].c_str()));
+					file.close();
+				return false ;
+				//std::cerr << "Bad string detected" << std::endl;
+			}
+
+			if(file.atEnd())
+			n-- ;
+		else if(n < max_size)
+			++n ;
+	}
+	file.close();
+		return true;
+		}
+	return false;
+}
+bool RsCollection::load(QWidget *parent)
+{
+	QString fileName;
+	if (!misc::getOpenFileName(parent, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Open collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
+		return false;
+
+	std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
+
+	return load(fileName, true);
 }
 
 bool RsCollection::save(const QString& fileName) const
 {
-    QFile file(fileName);
+	QFile file(fileName);
 
-    if (!file.open(QIODevice::WriteOnly))
-    {
-        std::cerr << "Cannot write to file " << fileName.toStdString() << " !!" << std::endl;
-        return false;
-    }
+	if (!file.open(QIODevice::WriteOnly))
+	{
+		std::cerr << "Cannot write to file " << fileName.toStdString() << " !!" << std::endl;
+		return false;
+	}
 
-    QDomDocument xml_doc ;
-    QDomElement root = xml_doc.createElement("RsCollection");
+	QTextStream stream(&file) ;
+	stream.setCodec("UTF-8") ;
 
-    const RsFileTree::DirData& root_data(mFileTree->directoryData(mFileTree->root()));
+	stream << _xml_doc.toString() ;
 
-    if(!recursExportToXml(xml_doc,root,root_data))
-        return false;
+	file.close();
 
-    xml_doc.appendChild(root);
-
-    QTextStream stream(&file) ;
-    stream.setCodec("UTF-8") ;
-
-    stream << xml_doc.toString() ;
-    file.close();
-
-    return true;
+	return true;
 }
 
-bool RsCollection::recursParseXml(QDomDocument& doc,const QDomNode& e,const RsFileTree::DirIndex parent)
+bool RsCollection::save(QWidget *parent) const
 {
-    mHashes.clear();
-    QDomNode n = e.firstChild() ;
-#ifdef COLLECTION_DEBUG
-    std::cerr << "Parsing element " << e.tagName().toStdString() << std::endl;
-#endif
+	QString fileName;
+	if(!misc::getSaveFileName(parent, RshareSettings::LASTDIR_EXTRAFILE, QApplication::translate("RsCollectionFile", "Create collection file"), QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")", fileName))
+		return false;
 
-    while(!n.isNull())
-    {
-        QDomElement ee = n.toElement(); // try to convert the node to an element.
+	if (!fileName.endsWith("." + RsCollection::ExtensionString))
+		fileName += "." + RsCollection::ExtensionString ;
 
-#ifdef COLLECTION_DEBUG
-        std::cerr << "  Seeing child " << ee.tagName().toStdString() << std::endl;
-#endif
+	std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
 
-        if(ee.tagName() == QString("File"))
-        {
-            RsFileHash hash(ee.attribute(QString("sha1")).toStdString()) ;
-
-            bool bad_chars_detected = false;
-            std::string name = purifyFileName(ee.attribute(QString("name")), bad_chars_detected).toUtf8().constData() ;
-            uint64_t size = ee.attribute(QString("size")).toULongLong() ;
-
-            mHashes[hash] = mFileTree->addFile(parent,name,hash,size);
-        }
-        else if(ee.tagName() == QString("Directory"))
-        {
-            bool bad_chars_detected = false ;
-            std::string cleanDirName = purifyFileName(ee.attribute(QString("name")),bad_chars_detected).toUtf8().constData() ;
-
-            RsFileTree::DirIndex new_dir_index = mFileTree->addDirectory(parent,cleanDirName);
-
-            recursParseXml(doc,ee,new_dir_index);
-        }
-
-        n = n.nextSibling() ;
-    }
-    return true;
+	return save(fileName);
 }
-bool RsCollection::recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const
+
+
+bool RsCollection::openNewColl(QWidget *parent, QString fileName)
 {
-    for(uint32_t i=0;i<dd.subfiles.size();++i)
-    {
-        QDomElement f = doc.createElement("File") ;
+	if(!misc::getSaveFileName(parent, RshareSettings::LASTDIR_EXTRAFILE
+														, QApplication::translate("RsCollectionFile", "Create collection file")
+														, QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")"
+														, fileName,0, QFileDialog::DontConfirmOverwrite))
+		return false;
 
-        const RsFileTree::FileData& fd(mFileTree->fileData(dd.subfiles[i]));
+	if (!fileName.endsWith("." + RsCollection::ExtensionString))
+		fileName += "." + RsCollection::ExtensionString ;
 
-        f.setAttribute(QString("name"),QString::fromUtf8(fd.name.c_str())) ;
-        f.setAttribute(QString("sha1"),QString::fromStdString(fd.hash.toStdString())) ;
-        f.setAttribute(QString("size"),QString::number(fd.size)) ;
+	std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
 
-        e.appendChild(f) ;
-    }
+	QFile file(fileName) ;
 
-    for(uint32_t i=0;i<dd.subdirs.size();++i)
-    {
-        const RsFileTree::DirData& di(mFileTree->directoryData(dd.subdirs[i]));
+	if(file.exists())
+	{
+		if (!checkFile(fileName,true)) return false;
 
-        QDomElement d = doc.createElement("Directory") ;
-        d.setAttribute(QString("name"),QString::fromUtf8(di.name.c_str())) ;
+		QMessageBox mb;
+		mb.setText(tr("Save Collection File."));
+		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);
+		mb.setIcon(QMessageBox::Question);
+		mb.exec();
 
-        if(!recursExportToXml(doc,d,di))
-            return false;
+		if (mb.clickedButton()==btnOwerWrite) {
+			//Nothing to do _xml_doc already up to date
+		} else if (mb.clickedButton()==btnMerge) {
+			//Open old file to merge it with _xml_doc
+			QDomDocument qddOldFile("RsCollection");
+			if (qddOldFile.setContent(&file)) {
+				QDomElement docOldElem = qddOldFile.elementsByTagName("RsCollection").at(0).toElement();
+				std::vector<ColFileInfo> colOldFileInfos;
+				recursCollectColFileInfos(docOldElem,colOldFileInfos,QString(),false);
 
-        e.appendChild(d) ;
-    }
+				QDomElement root = _xml_doc.elementsByTagName("RsCollection").at(0).toElement();
+				for(uint32_t i = 0;i<colOldFileInfos.size();++i){
+					recursAddElements(_xml_doc,colOldFileInfos[i],root) ;
+				}
+			}
 
-    return true;
+		} else if (mb.clickedButton()==btnCancel) {
+			return false;
+		} else {
+			return false;
+		}
+
+	}//if(file.exists())
+
+	_fileName=fileName;
+	std::vector<ColFileInfo> colFileInfos ;
+
+	recursCollectColFileInfos(_xml_doc.documentElement(),colFileInfos,QString(),false) ;
+
+	RsCollectionDialog* rcd = new RsCollectionDialog(fileName, colFileInfos,true);
+	connect(rcd,SIGNAL(saveColl(std::vector<ColFileInfo>, QString)),this,SLOT(saveColl(std::vector<ColFileInfo>, QString))) ;
+	_saved=false;
+	rcd->exec() ;
+	delete rcd;
+
+	return _saved;
 }
 
-qulonglong RsCollection::count() const
+bool RsCollection::openColl(const QString& fileName, bool readOnly /* = false */, bool showError /* = true*/)
 {
-    return mFileTree->numFiles();
+	if (load(fileName, showError)) {
+		std::vector<ColFileInfo> colFileInfos ;
+
+		recursCollectColFileInfos(_xml_doc.documentElement(),colFileInfos,QString(),false) ;
+
+		RsCollectionDialog* rcd = new RsCollectionDialog(fileName, colFileInfos, true, readOnly);
+		connect(rcd,SIGNAL(saveColl(std::vector<ColFileInfo>, QString)),this,SLOT(saveColl(std::vector<ColFileInfo>, QString))) ;
+		_saved=false;
+		rcd->exec() ;
+		delete rcd;
+
+		return _saved;
+	}
+	return false;
 }
+
 qulonglong RsCollection::size()
 {
-    return mFileTree->totalFileSize();
+	QDomElement docElem = _xml_doc.documentElement();
+
+	std::vector<ColFileInfo> colFileInfos;
+	recursCollectColFileInfos(docElem, colFileInfos, QString(),false);
+
+	uint64_t size = 0;
+
+	for (uint32_t i = 0; i < colFileInfos.size(); ++i) {
+		size += colFileInfos[i].size;
+	}
+
+	return size;
 }
 
 bool RsCollection::isCollectionFile(const QString &fileName)
 {
-    QString ext = QFileInfo(fileName).suffix().toLower();
+	QString ext = QFileInfo(fileName).suffix().toLower();
 
-    return (ext == RsCollection::ExtensionString);
+	return (ext == RsCollection::ExtensionString);
 }
 
-void RsCollection::updateHashes(const std::map<RsFileHash,RsFileHash>& old_to_new_hashes)
+void RsCollection::saveColl(std::vector<ColFileInfo> colFileInfos, const QString &fileName)
 {
-    for(auto it:old_to_new_hashes)
-    {
-        auto fit = mHashes.find(it.first);
 
-        if(fit == mHashes.end())
-        {
-            RsErr() << "Could not find hash " << it.first << " in RsCollection list of hashes. This is a bug." ;
-            return ;
-        }
-        const auto& fd(mFileTree->fileData(fit->second));
+	QDomElement root = _xml_doc.elementsByTagName("RsCollection").at(0).toElement();
+	while (root.childNodes().count()>0) root.removeChild(root.firstChild());
+	for(uint32_t i = 0;i<colFileInfos.size();++i)
+		recursAddElements(_xml_doc,colFileInfos[i],root) ;
+
+	_saved=save(fileName);
 
-        if(fd.hash != it.first)
-        {
-            RsErr() << "Mismatch hash for file " << fd.name << " (found " << fd.hash << " instead of " << it.first << ") in RsCollection list of hashes. This is a bug." ;
-            return ;
-        }
-        mFileTree->updateFile(fit->second,fd.name,it.second,fd.size);
-    }
-}
-
-bool RsCollection::removeFile(RsFileTree::FileIndex index_to_remove,RsFileTree::DirIndex parent_index)
-{
-    return mFileTree->removeFile(index_to_remove,parent_index);
-}
-bool RsCollection::removeDirectory(RsFileTree::DirIndex index_to_remove,RsFileTree::DirIndex parent_index)
-{
-    return mFileTree->removeDirectory(index_to_remove,parent_index);
-}
-
-void RsCollection::cleanup()
-{
-    RsDbg() << "Cleaning up RsCollection with " << mFileTree->numDirs() << " dirs and " << mFileTree->numFiles() << " files." ;
-
-    mFileTree = RsFileTree::fromTreeCleaned(*mFileTree);
-
-    RsDbg() << "Simplified to " << mFileTree->numDirs() << " dirs and " << mFileTree->numFiles() << " files.";
 }
diff --git a/retroshare-gui/src/gui/common/RsCollection.h b/retroshare-gui/src/gui/common/RsCollection.h
index f68423f85..492d407d8 100644
--- a/retroshare-gui/src/gui/common/RsCollection.h
+++ b/retroshare-gui/src/gui/common/RsCollection.h
@@ -26,6 +26,7 @@
 
 #pragma once
 
+#include <QObject>
 #include <QString>
 #include <QDomDocument>
 #include <QFile>
@@ -52,70 +53,66 @@ public:
 };
 Q_DECLARE_METATYPE(ColFileInfo)
 
-class RsCollection
+class RsCollection : public QObject
 {
+	Q_OBJECT
+
 public:
-    enum class RsCollectionErrorCode:uint8_t {
-        COLLECTION_NO_ERROR           = 0x00,
-        UNKNOWN_ERROR                 = 0x01,
-        FILE_READ_ERROR               = 0x02,
-        FILE_CONTAINS_HARMFUL_STRINGS = 0x03,
-        INVALID_ROOT_NODE             = 0x04,
-        XML_PARSING_ERROR             = 0x05
-    };
 
-    RsCollection();
-    RsCollection(const RsCollection&);
-    RsCollection(const std::vector<DirDetails>& file_entries, FileSearchFlags flags) ;
-    RsCollection(const RsFileTree& ft);
-    RsCollection(const QString& filename,RsCollectionErrorCode& error_code);
+	RsCollection(QObject *parent = 0) ;
+	// create from list of files and directories
+	RsCollection(const std::vector<DirDetails>& file_entries, FileSearchFlags flags, QObject *parent = 0) ;
+	RsCollection(const RsFileTree& fr);
+	virtual ~RsCollection() ;
 
-    static QString errorString(RsCollectionErrorCode code);
-
-    virtual ~RsCollection() ;
-
-    void merge_in(const QString& fname,uint64_t size,const RsFileHash& hash,RsFileTree::DirIndex parent_index=0) ;
-    void merge_in(const RsFileTree& tree,RsFileTree::DirIndex parent_index=0) ;
-
-    bool removeFile(RsFileTree::FileIndex index_to_remove,RsFileTree::DirIndex parent_index);
-    bool removeDirectory(RsFileTree::DirIndex index_to_remove,RsFileTree::DirIndex parent_index);
-
-    void cleanup(); // cleans up the collection, which may contain unreferenced files/dirs after lazy editing.
+	void merge_in(const QString& fname,uint64_t size,const RsFileHash& hash) ;
+	void merge_in(const RsFileTree& tree) ;
 
 	static const QString ExtensionString ;
 
+	// Loads file from disk.
+	bool load(QWidget *parent);
+	bool load(const QString& fileName, bool showError = true);
+
 	// Save to disk
+	bool save(QWidget *parent) const ;
 	bool save(const QString& fileName) const ;
 
-    // returns the file tree
-    const RsFileTree& fileTree() const { return *mFileTree; }
-    // total size of files in the collection
-    qulonglong size();
-    // total number of files in the collection
-    qulonglong count() const;
+	// Open new collection
+	bool openNewColl(QWidget *parent, QString fileName = "");
+	// Open existing collection
+	bool openColl(const QString& fileName, bool readOnly = false, bool showError = true);
+
+	// Download the content.
+	void downloadFiles() const ;
+	// Auto Download all the content.
+	void autoDownloadFiles() const ;
+
+	qulonglong size();
 
 	static bool isCollectionFile(const QString& fileName);
 
-    void updateHashes(const std::map<RsFileHash,RsFileHash>& old_to_new_hashes);
+private slots:
+	void saveColl(std::vector<ColFileInfo> colFileInfos, const QString& fileName);
+
 private:
 
-    bool recursExportToXml(QDomDocument& doc,QDomElement& e,const RsFileTree::DirData& dd) const;
-    bool recursParseXml(QDomDocument& doc, const QDomNode &e, RsFileTree::DirIndex dd) ;
-
-    // This function is used to populate a RsCollection from locally or remotly shared files.
-    void recursAddElements(RsFileTree::DirIndex parent, const DirDetails& dd, FileSearchFlags flags) ;
-
-    // This function is used to merge an existing RsFileTree into the RsCollection
-    void recursMergeTree(RsFileTree::DirIndex parent, const RsFileTree& tree, const RsFileTree::DirData &dd);
-
-    // check that the file is a valid rscollection file, and not a lol bomb or some shit like this
-    static bool checkFile(const QString &fileName, RsCollectionErrorCode &error);
+	void recursAddElements(QDomDocument&, const DirDetails&, QDomElement&, FileSearchFlags flags) const ;
+	void recursAddElements(QDomDocument&,const ColFileInfo&,QDomElement&) const;
+	void recursAddElements(
+	        QDomDocument& doc, const RsFileTree& ft, uint32_t index,
+	        QDomElement& e ) const;
 
+	void recursCollectColFileInfos(const QDomElement&,std::vector<ColFileInfo>& colFileInfos,const QString& current_dir,bool bad_chars_in_parent) const ;
+	// check that the file is a valid rscollection file, and not a lol bomb or some shit like this
+	static bool checkFile(const QString &fileName, bool showError);
 	// Auto Download recursively.
 	void autoDownloadFiles(ColFileInfo colFileInfo, QString dlDir) const ;
 
-    std::unique_ptr<RsFileTree> mFileTree;
-    std::map<RsFileHash,RsFileTree::FileIndex> mHashes;	// used to efficiently update files being hashed
+	QDomDocument _xml_doc ;
+	QString _fileName ;
+	bool _saved;
+	QDomElement _root ;
 
 	friend class RsCollectionDialog ;
 };
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
index 5eb56506d..417af69bc 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.cpp
@@ -23,7 +23,6 @@
 
 #include "RsCollection.h"
 #include "util/misc.h"
-#include "util/rsdir.h"
 
 #include <QCheckBox>
 #include <QDateTime>
@@ -121,93 +120,80 @@ protected:
 /**
  * @brief RsCollectionDialog::RsCollectionDialog
  * @param collectionFileName: Filename of RSCollection saved
+ * @param colFileInfos: Vector of ColFileInfo to be add in intialization
  * @param creation: Open dialog as RsColl Creation or RsColl DownLoad
  * @param readOnly: Open dialog for RsColl as ReadOnly
  */
-RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName, RsCollectionDialogMode mode)
-  : _mode(mode)
-{
-    RsCollection::RsCollectionErrorCode err_code;
-    mCollection = new RsCollection(collectionFileName,err_code);
-
-    if(err_code != RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
-    {
-        QMessageBox::information(nullptr,tr("Could not load collection file"),tr("Could not load collection file"));
-        close();
-    }
-
-    init(collectionFileName);
-}
-
-RsCollectionDialog::RsCollectionDialog(const RsCollection& coll, RsCollectionDialogMode mode)
-  : _mode(mode)
-{
-    mCollection = new RsCollection(coll);
-    init(QString());
-}
-void RsCollectionDialog::init(const QString& collectionFileName)
+RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
+                                       , const std::vector<ColFileInfo>& colFileInfos
+                                       , const bool& creation /* = false*/
+                                       , const bool& readOnly)
+  : _fileName(collectionFileName), _creationMode(creation) ,_readOnly(readOnly)
 {
 	ui.setupUi(this) ;
-    ui._filename_TL->setText(collectionFileName);
 
-//	uint32_t size = colFileInfos.size();
-//	for(uint32_t i=0;i<size;++i)
-//	{
-//		const ColFileInfo &colFileInfo = colFileInfos[i];
-//		_newColFileInfos.push_back(colFileInfo);
-//	}
+	uint32_t size = colFileInfos.size();
+	for(uint32_t i=0;i<size;++i)
+	{
+		const ColFileInfo &colFileInfo = colFileInfos[i];
+		_newColFileInfos.push_back(colFileInfo);
+	}
 
 	setWindowFlags(Qt::Window); // for maximize button
 	setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint);
 
-    setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(collectionFileName).completeBaseName()));
+	setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName()));
 	
 	
     ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/icons/collections.png"));
 
-    if(_mode == DOWNLOAD)
+	if(creation)
+	{
+		ui.headerFrame->setHeaderText(tr("Collection Editor"));
+		ui.downloadFolder_LE->hide();
+		ui.downloadFolder_LB->hide();
+		ui.destinationDir_TB->hide();
+	}
+	else
 	{
 		ui.headerFrame->setHeaderText(tr("Download files"));
 		ui.downloadFolder_LE->show();
 		ui.downloadFolder_LB->show();
-        ui.label_filename->hide();
+		ui.label_filename->hide();
 		ui._filename_TL->hide();
 
 		ui.downloadFolder_LE->setText(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str())) ;
 
 		QObject::connect(ui.downloadFolder_LE,SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(openDestinationDirectoryMenu()));
 		QObject::connect(ui.destinationDir_TB,SIGNAL(pressed()), this, SLOT(openDestinationDirectoryMenu()));
-    }
-    else
-    {
-        ui.headerFrame->setHeaderText(tr("Collection Editor"));
-        ui.downloadFolder_LE->hide();
-        ui.downloadFolder_LB->hide();
-        ui.destinationDir_TB->hide();
-        ui.label_filename->show();
-        ui._filename_TL->show();
-    }
-
+	}
 
 	// 1 - add all elements to the list.
 
-    mCollectionModel = new RsCollectionModel(*mCollection);
-    ui._fileEntriesTW->setModel(mCollectionModel);
+	ui._fileEntriesTW->setColumnCount(COLUMN_COUNT) ;
 
-    connect(mCollectionModel,SIGNAL(sizesChanged()),this,SLOT(updateSizes()));
-    updateSizes(); // forced because it's only called when the collection is changed, or when the model is created.
+	QTreeWidgetItem *headerItem = ui._fileEntriesTW->headerItem();
+	headerItem->setText(COLUMN_FILE, tr("File"));
+	headerItem->setText(COLUMN_FILEPATH, tr("File Path"));
+	headerItem->setText(COLUMN_SIZE, tr("Size"));
+	headerItem->setText(COLUMN_HASH, tr("Hash"));
+	headerItem->setText(COLUMN_FILEC, tr("File Count"));
+
+	bool wrong_chars = !updateList();
 
 	// 2 - connect necessary signals/slots
 
 	connect(ui._changeFile, SIGNAL(clicked()), this, SLOT(changeFileName()));
-    connect(ui._add_PB, SIGNAL(clicked()), this, SLOT(addSelection()));
-    connect(ui._addRecur_PB, SIGNAL(clicked()), this, SLOT(addSelectionRecursive()));
+	connect(ui._add_PB, SIGNAL(clicked()), this, SLOT(add()));
+	connect(ui._addRecur_PB, SIGNAL(clicked()), this, SLOT(addRecursive()));
 	connect(ui._remove_PB, SIGNAL(clicked()), this, SLOT(remove()));
 	connect(ui._makeDir_PB, SIGNAL(clicked()), this, SLOT(makeDir()));
+	connect(ui._removeDuplicate_CB, SIGNAL(clicked(bool)), this, SLOT(updateRemoveDuplicate(bool)));
 	connect(ui._cancel_PB, SIGNAL(clicked()), this, SLOT(cancel()));
 	connect(ui._save_PB, SIGNAL(clicked()), this, SLOT(save()));
 	connect(ui._download_PB, SIGNAL(clicked()), this, SLOT(download()));
 	connect(ui._hashBox, SIGNAL(fileHashingFinished(QList<HashedFile>)), this, SLOT(fileHashingFinished(QList<HashedFile>)));
+	connect(ui._fileEntriesTW, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*,int)));
 
 	// 3 Initialize List
 	_dirModel = new QFileSystemModel(this);
@@ -230,12 +216,14 @@ void RsCollectionDialog::init(const QString& collectionFileName)
 	processSettings(true);
 
 	// 5 Activate button follow creationMode
-    ui._changeFile->setVisible(_mode == EDIT);
-    ui._makeDir_PB->setVisible(_mode == EDIT);
-    ui._save_PB->setVisible(_mode == EDIT);
-    ui._treeViewFrame->setVisible(_mode == EDIT);
-    ui._download_PB->setVisible(_mode == DOWNLOAD);
+	ui._changeFile->setVisible(_creationMode && !_readOnly);
+	ui._makeDir_PB->setVisible(_creationMode && !_readOnly);
+	ui._removeDuplicate_CB->setVisible(_creationMode && !_readOnly);
+	ui._save_PB->setVisible(_creationMode && !_readOnly);
+	ui._treeViewFrame->setVisible(_creationMode && !_readOnly);
+	ui._download_PB->setVisible(!_creationMode && !_readOnly);
 
+	ui._fileEntriesTW->installEventFilter(this);
 	ui._systemFileTW->installEventFilter(this);
 
 	// 6 Add HashBox
@@ -243,6 +231,9 @@ void RsCollectionDialog::init(const QString& collectionFileName)
 	ui._hashBox->setDropWidget(this);
 	ui._hashBox->setAutoHide(true);
 	ui._hashBox->setDefaultTransferRequestFlags(RS_FILE_REQ_ANONYMOUS_ROUTING) ;
+
+	if(wrong_chars)
+		QMessageBox::warning(NULL,tr("Bad filenames have been cleaned"),tr("Some filenames or directory names contained forbidden characters.\nCharacters <b>\",|,/,\\,&lt;,&gt;,*,?</b> will be replaced by '_'.\n Concerned files are listed in red.")) ;
 }
 
 void RsCollectionDialog::openDestinationDirectoryMenu()
@@ -294,18 +285,85 @@ RsCollectionDialog::~RsCollectionDialog()
 	processSettings(false);
 }
 
+/**
+ * @brief RsCollectionDialog::eventFilter: Proccess event in object
+ * @param obj: object where event occured
+ * @param event: event occured
+ * @return If we don't have to process event in parent.
+ */
+bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
+{
+	if (obj == ui._fileEntriesTW) {
+		if (event->type() == QEvent::KeyPress) {
+			QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+			if (keyEvent && (keyEvent->key() == Qt::Key_Space)) {
+				// Space pressed
+
+				// get state of current item
+				QTreeWidgetItem *item = ui._fileEntriesTW->currentItem();
+				if (item) {
+					Qt::CheckState checkState = (item->checkState(COLUMN_FILE) == Qt::Checked) ? Qt::Unchecked : Qt::Checked;
+
+					// set state of all selected items
+					QList<QTreeWidgetItem*> selectedItems = ui._fileEntriesTW->selectedItems();
+					QList<QTreeWidgetItem*>::iterator it;
+					for (it = selectedItems.begin(); it != selectedItems.end(); ++it) {
+						if ((*it)->checkState(COLUMN_FILE) != checkState)
+							(*it)->setCheckState(COLUMN_FILE, checkState);
+					}
+				}
+
+				return true; // eat event
+			}
+
+			if (keyEvent && (keyEvent->key() == Qt::Key_Delete)) {
+				// Delete pressed
+				remove();
+				return true; // eat event
+			}
+
+			if (keyEvent && (keyEvent->key() == Qt::Key_Plus)) {
+				// Plus pressed
+				makeDir();
+				return true; // eat event
+			}
+
+		}
+	}
+
+	if (obj == ui._systemFileTW) {
+		if (event->type() == QEvent::KeyPress) {
+			QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+			if (keyEvent && ((keyEvent->key() == Qt::Key_Enter)
+			                 || keyEvent->key() == Qt::Key_Return)) {
+				// Enter pressed
+				if (keyEvent->modifiers() == Qt::ShiftModifier)
+					addRecursive();
+				else if(keyEvent->modifiers() == Qt::NoModifier) {
+					add();
+				}
+
+				return true; // eat event
+			}
+		}
+	}
+
+	// pass the event on to the parent class
+	return QDialog::eventFilter(obj, event);
+}
+
 /**
  * @brief RsCollectionDialog::processSettings
  * @param bLoad: Load or Save dialog's settings
  */
 void RsCollectionDialog::processSettings(bool bLoad)
 {
-    Settings->beginGroup("RsCollectionDialogV2");
+	Settings->beginGroup("RsCollectionDialog");
 
 	if (bLoad) {
 		// load settings
 
-        if(_mode == EDIT){
+		if(_creationMode && !_readOnly){
 			// Load windows geometrie
 			restoreGeometry(Settings->value("WindowGeometrie_CM").toByteArray());
 			// Load splitters state
@@ -327,7 +385,7 @@ void RsCollectionDialog::processSettings(bool bLoad)
 			ui._fileEntriesTW->header()->restoreState(Settings->value("FileEntriesHeader").toByteArray());
 		}
 	} else {
-        if(_mode == EDIT){
+		if(_creationMode && !_readOnly){
 			// Save windows geometrie
 			Settings->setValue("WindowGeometrie_CM",saveGeometry());
 			// Save splitters state
@@ -353,6 +411,182 @@ void RsCollectionDialog::processSettings(bool bLoad)
 	Settings->endGroup();
 }
 
+/**
+ * @brief RsCollectionDialog::getRootItem: Create the root Item if not existing
+ * @return: the root item
+ */
+QTreeWidgetItem* RsCollectionDialog::getRootItem()
+{
+	return ui._fileEntriesTW->invisibleRootItem();
+
+// (csoler) I removed this code because it does the job of the invisibleRootItem() method.
+//
+//	QTreeWidgetItem* root= ui._fileEntriesTW->topLevelItem(0);
+//	if (!root) {
+//		root= new QTreeWidgetItem;
+//		root->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate);
+//		root->setText(COLUMN_FILE, "/");
+//		root->setToolTip(COLUMN_FILE,tr("This is the root directory."));
+//		root->setText(COLUMN_FILEPATH, "/");
+//		root->setText(COLUMN_HASH, "");
+//		root->setData(COLUMN_HASH, ROLE_NAME, "");
+//		root->setData(COLUMN_HASH, ROLE_PATH, "");
+//		root->setData(COLUMN_HASH, ROLE_TYPE, DIR_TYPE_DIR);
+//		root->setText(COLUMN_SIZE, misc::friendlyUnit(0));
+//		root->setToolTip(COLUMN_SIZE, tr("Real Size: Waiting child..."));
+//		root->setData(COLUMN_SIZE, ROLE_SIZE, 0);
+//		root->setData(COLUMN_SIZE, ROLE_SELSIZE, 0);
+//		root->setText(COLUMN_FILEC, "0");
+//		root->setToolTip(COLUMN_FILEC, tr("Real File Count: Waiting child..."));
+//		root->setData(COLUMN_FILEC, ROLE_FILEC, 0);
+//		root->setData(COLUMN_FILEC, ROLE_SELFILEC, 0);
+//		ui._fileEntriesTW->addTopLevelItem(root);
+//	}
+//	root->setExpanded(true);
+//
+//	return root;
+}
+
+/**
+ * @brief RsCollectionDialog::updateList: Update list of item in RsCollection
+ * @return If at least one item have a Wrong Char
+ */
+bool RsCollectionDialog::updateList()
+{
+	bool wrong_chars = false ;
+	wrong_chars = addChild(getRootItem(), _newColFileInfos);
+
+	_newColFileInfos.clear();
+
+	ui._filename_TL->setText(_fileName) ;
+	for (int column = 0; column < ui._fileEntriesTW->columnCount(); ++column) {
+		ui._fileEntriesTW->resizeColumnToContents(column);
+	}
+
+	updateSizes() ;
+
+	return !wrong_chars;
+}
+
+/**
+ * @brief RsCollectionDialog::addChild: Add Child Item in list
+ * @param parent: Parent Item
+ * @param child: Child ColFileInfo item to add
+ * @param total_size: Saved total size of children to save in parent
+ * @param total_files: Saved total file of children to save in parent
+ * @return If at least one item have a Wrong Char
+ */
+bool RsCollectionDialog::addChild(QTreeWidgetItem* parent, const std::vector<ColFileInfo>& child)
+{
+	bool wrong_chars = false ;
+
+	uint32_t childCount = child.size();
+	for(uint32_t i=0; i<childCount; ++i)
+	{
+		const ColFileInfo &colFileInfo = child[i];
+
+		QList<QTreeWidgetItem*> founds;
+		QList<QTreeWidgetItem*> parentsFounds;
+		parentsFounds = ui._fileEntriesTW->findItems(colFileInfo.path , Qt::MatchExactly | Qt::MatchRecursive, COLUMN_FILEPATH);
+		if (colFileInfo.type == DIR_TYPE_DIR){
+			founds = ui._fileEntriesTW->findItems(colFileInfo.path + "/" +colFileInfo.name, Qt::MatchExactly | Qt::MatchRecursive, COLUMN_FILEPATH);
+		} else {
+			founds = ui._fileEntriesTW->findItems(colFileInfo.path + "/" +colFileInfo.name, Qt::MatchExactly | Qt::MatchRecursive, COLUMN_FILEPATH);
+			if (ui._removeDuplicate_CB->isChecked()) {
+				founds << ui._fileEntriesTW->findItems(colFileInfo.hash, Qt::MatchExactly | Qt::MatchRecursive, COLUMN_HASH);
+			}
+		}
+		if (founds.empty()) {
+			QTreeWidgetItem *item = new QTreeWidgetItem;
+
+			//item->setFlags(Qt::ItemIsUserCheckable | item->flags());
+			item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsTristate);
+			item->setCheckState(COLUMN_FILE, Qt::Checked);
+			item->setText(COLUMN_FILE, colFileInfo.name);
+			item->setText(COLUMN_FILEPATH, colFileInfo.path + "/" + colFileInfo.name);
+			item->setText(COLUMN_HASH, colFileInfo.hash);
+			item->setData(COLUMN_HASH, ROLE_NAME, colFileInfo.name);
+			item->setData(COLUMN_HASH, ROLE_PATH, colFileInfo.path);
+			item->setData(COLUMN_HASH, ROLE_TYPE, colFileInfo.type);
+			QFont font = item->font(COLUMN_FILE);
+			if (colFileInfo.type==DIR_TYPE_DIR) {
+				item->setToolTip(COLUMN_FILE,tr("This is a directory. Double-click to expand it."));
+				font.setBold(true);
+				//Size calculated after for added child after init
+				item->setText(COLUMN_SIZE, misc::friendlyUnit(0));
+				item->setToolTip(COLUMN_SIZE,tr("Real Size: Waiting child..."));
+				item->setData(COLUMN_SIZE, ROLE_SIZE, 0);
+				item->setData(COLUMN_SIZE, ROLE_SELSIZE, 0);
+
+				item->setText(COLUMN_FILEC, "");
+				item->setToolTip(COLUMN_FILEC, tr("Real File Count: Waiting child..."));
+				item->setData(COLUMN_FILEC, ROLE_FILEC, 0);
+				item->setData(COLUMN_FILEC, ROLE_SELFILEC, 0);
+			} else {
+				font.setBold(false);
+				item->setText(COLUMN_SIZE, misc::friendlyUnit(colFileInfo.size));
+				item->setToolTip(COLUMN_SIZE, tr("Real Size=%1").arg(misc::friendlyUnit(colFileInfo.size)));
+				item->setData(COLUMN_SIZE, ROLE_SIZE, colFileInfo.size);
+				item->setData(COLUMN_SIZE, ROLE_SELSIZE, colFileInfo.size);
+
+				item->setText(COLUMN_FILEC, "1");
+				item->setToolTip(COLUMN_FILEC, tr("Real File Count=%1").arg(1));
+				item->setData(COLUMN_FILEC, ROLE_FILEC, 1);
+				item->setData(COLUMN_FILEC, ROLE_SELFILEC, 1);
+			}
+			item->setFont(COLUMN_FILE, font);
+			item->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless);
+
+			if (colFileInfo.filename_has_wrong_characters)
+			{
+				//TODO (Phenom): Add qproperty for these text colors in stylesheets
+				wrong_chars = true ;
+				item->setData(COLUMN_FILE, Qt::ForegroundRole, QColor(255,80,120)) ;
+			}
+
+			if (parentsFounds.empty()) {
+				parent->addChild(item);
+			} else {
+				parentsFounds.at(0)->addChild(item);
+			}
+
+			if (colFileInfo.type == DIR_TYPE_FILE) {
+				//update parents size only for file children
+				QTreeWidgetItem *itemParent = item->parent();
+				if (itemParent) {
+					while (itemParent) {
+						qulonglong parentSize = itemParent->data(COLUMN_SIZE, ROLE_SIZE).toULongLong() + colFileInfo.size;
+						itemParent->setData(COLUMN_SIZE, ROLE_SIZE, parentSize);
+						itemParent->setToolTip(COLUMN_SIZE, tr("Real Size=%1").arg(misc::friendlyUnit(parentSize)));
+						qulonglong parentSelSize = itemParent->data(COLUMN_SIZE, ROLE_SELSIZE).toULongLong() + colFileInfo.size;
+						itemParent->setData(COLUMN_SIZE, ROLE_SELSIZE, parentSelSize);
+						itemParent->setText(COLUMN_SIZE, misc::friendlyUnit(parentSelSize));
+
+						qulonglong parentFileCount = itemParent->data(COLUMN_FILEC, ROLE_FILEC).toULongLong() + 1;
+						itemParent->setData(COLUMN_FILEC, ROLE_FILEC, parentFileCount);
+						itemParent->setToolTip(COLUMN_FILEC, tr("Real File Count=%1").arg(parentFileCount));
+						qulonglong parentSelFileCount = itemParent->data(COLUMN_FILEC, ROLE_SELFILEC).toULongLong() + 1;
+						itemParent->setData(COLUMN_FILEC, ROLE_SELFILEC, parentSelFileCount);
+						itemParent->setText(COLUMN_FILEC, QString("%1").arg(parentSelFileCount));
+
+						itemParent = itemParent->parent();
+					}
+				}
+			}
+
+			founds.push_back(item);
+		}
+
+		if (!founds.empty()) {
+
+			if (colFileInfo.type == DIR_TYPE_DIR) {
+				wrong_chars |= addChild(founds.at(0), colFileInfo.children);
+			}
+		}
+	}
+	return wrong_chars;
+}
+
 /**
  * @brief RsCollectionDialog::directoryLoaded: called when ui._treeView have load an directory as QFileSystemModel don't load all in one time
  * @param dirLoaded: Name of directory just loaded
@@ -362,7 +596,7 @@ void RsCollectionDialog::directoryLoaded(QString dirLoaded)
     if(!_dirLoaded)
     {
 
-        QFileInfo lastDir = QFileInfo(Settings->getLastDir(RshareSettings::LASTDIR_EXTRAFILE));
+        QFileInfo lastDir = Settings->getLastDir(RshareSettings::LASTDIR_EXTRAFILE);
         if (lastDir.absoluteFilePath() == "") return;
         if (lastDir.absoluteFilePath() == dirLoaded) _dirLoaded = true;
 
@@ -405,8 +639,17 @@ void RsCollectionDialog::directoryLoaded(QString dirLoaded)
  */
 void RsCollectionDialog::updateSizes()
 {
-    ui._selectedFiles_TL->setText(QString::number(mCollectionModel->totalSelected()));
-    ui._totalSize_TL->setText(misc::friendlyUnit(mCollectionModel->totalSize()));
+	uint64_t total_size = 0 ;
+	uint32_t total_count = 0 ;
+
+	for(int i=0;i<ui._fileEntriesTW->topLevelItemCount();++i)
+	{
+		total_size  += ui._fileEntriesTW->topLevelItem(i)->data(COLUMN_SIZE ,ROLE_SELSIZE ).toULongLong();
+		total_count += ui._fileEntriesTW->topLevelItem(i)->data(COLUMN_FILEC,ROLE_SELFILEC).toULongLong();
+	}
+
+	ui._selectedFiles_TL->setText(QString::number(total_count));
+	ui._totalSize_TL->setText(misc::friendlyUnit(total_size));
 }
 
 /**
@@ -415,21 +658,21 @@ void RsCollectionDialog::updateSizes()
  * @param bad
  * @return
  */
-static bool checkFileName(const std::string& input, std::string& corrected)
+static QString purifyFileName(const QString& input, bool& bad)
 {
-    static const std::string bad_chars ( "/\\\"*:?<>|" );
-    bool ok = true ;
-    corrected = input ;
+	static const QString bad_chars = "/\\\"*:?<>|" ;
+	bad = false ;
+	QString output = input ;
 
-    for(uint32_t i=0;i<input.length();++i)
-        for(uint32_t j=0;j<bad_chars.length();++j)
-            if(input[i] == bad_chars[j])
+	for(int i=0;i<output.length();++i)
+		for(int j=0;j<bad_chars.length();++j)
+			if(output[i] == bad_chars[j])
 			{
-                corrected[i] = '_' ;
-                ok = false ;
+				output[i] = '_' ;
+				bad = true ;
 			}
 
-    return ok ;
+	return output ;
 }
 
 /**
@@ -450,99 +693,63 @@ void RsCollectionDialog::changeFileName()
 	std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
 
 	QFile file(fileName) ;
-    RsCollection::RsCollectionErrorCode err;
 
-    if(file.exists() && RsCollection::checkFile(fileName,err))
-    {
+	if(file.exists())
+	{
+		RsCollection collFile;
+		if (!collFile.checkFile(fileName,true)) return;
+
 		QMessageBox mb;
 		mb.setText(tr("Save Collection File."));
 		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);
+		QAbstractButton *btnMerge = mb.addButton(tr("Merge"), QMessageBox::NoRole);
+		QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
 		mb.setIcon(QMessageBox::Question);
 		mb.exec();
 
 		if (mb.clickedButton()==btnOwerWrite) {
 			//Nothing to do
-        }
-        else if(mb.clickedButton()==btnMerge)
-        {
+		} else if (mb.clickedButton()==btnMerge) {
 			//Open old file to merge it with RsCollection
+			QDomDocument qddOldFile("RsCollection");
+			if (qddOldFile.setContent(&file)) {
+				QDomElement docOldElem = qddOldFile.elementsByTagName("RsCollection").at(0).toElement();
+				collFile.recursCollectColFileInfos(docOldElem,_newColFileInfos,QString(),false);
+			}
 
-            RsCollection qddOldFileCollection(fileName,err);
-
-            if(err != RsCollection::RsCollectionErrorCode::COLLECTION_NO_ERROR)
-            {
-                mCollectionModel->preMods();
-                mCollection->merge_in(qddOldFileCollection.fileTree());
-                mCollectionModel->postMods();
-            }
-        }
-        else if(mb.clickedButton()==btnCancel)
+		} else if (mb.clickedButton()==btnCancel) {
 			return;
-        else
+		} else {
 			return;
+		}
 
-    }
-    else
-    {
+	} else {//if(file.exists())
 		//create a new empty file to check if name if good.
-        if (!file.open(QFile::WriteOnly))
-            return;
+		if (!file.open(QFile::WriteOnly)) return;
 		file.remove();
 	}
 
-    ui._filename_TL->setText(fileName);
+	_fileName = fileName;
+
+	updateList();
 }
 
 /**
  * @brief RsCollectionDialog::add:  */
-void RsCollectionDialog::addSelection()
+void RsCollectionDialog::add()
 {
-    addSelection(false);
+	addRecursive(false);
 }
 
 /**
  * @brief RsCollectionDialog::addRecursive:
  */
-void RsCollectionDialog::addSelectionRecursive()
+void RsCollectionDialog::addRecursive()
 {
-    addSelection(true);
+	addRecursive(true);
 }
 
-static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree::DirIndex dir_index,bool recursive,std::map<QString,RsFileHash>& paths_to_hash)
-{
-    QFileInfo fileInfo = QFileInfo(path);
-
-    if (fileInfo.isDir())
-    {
-        auto di = tree.addDirectory(dir_index,fileInfo.fileName().toUtf8().constData());
-
-        if(recursive)
-        {
-            QDir dirParent = fileInfo.absoluteFilePath();
-            dirParent.setFilter(QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot);
-            QFileInfoList childrenList = dirParent.entryInfoList();
-
-            for(QFileInfo f:childrenList)
-                recursBuildFileTree(f.absoluteFilePath(),tree,di,recursive,paths_to_hash);
-        }
-    }
-    else
-    {
-        // Here we use a temporary hash that serves two purposes:
-        // 1 - identify the file in the RsFileTree of the collection so that we can update its hash when calculated
-        // 2 - mark the file as being processed
-        // The hash s is computed to be the hash of the path of the file. The collection must take care of multiple instances.
-
-        Sha1CheckSum s = RsDirUtil::sha1sum((uint8_t*)(fileInfo.filePath().toUtf8().constData()),fileInfo.filePath().toUtf8().size());
-
-        tree.addFile(dir_index,fileInfo.fileName().toUtf8().constData(),s,fileInfo.size());
-
-        paths_to_hash.insert(std::make_pair(fileInfo.filePath(),s));
-    }
-}
 /**
  * @brief RsCollectionDialog::addRecursive: Add Selected item to RSCollection
  *   -Add File seperatly if parent folder not selected
@@ -550,47 +757,139 @@ static void recursBuildFileTree(const QString& path,RsFileTree& tree,RsFileTree:
  *   -Get root folder the selected one
  * @param recursive: If true, add all selected directory childrens
  */
-void RsCollectionDialog::addSelection(bool recursive)
+void RsCollectionDialog::addRecursive(bool recursive)
 {
+	QStringList fileToHash;
 	QMap<QString, QString > dirToAdd;
+    int count=0;//to not scan all items on list .count()
+
 	QModelIndexList milSelectionList =	ui._systemFileTW->selectionModel()->selectedIndexes();
-
-    mCollectionModel->preMods();
-
-    std::map<QString,RsFileHash> paths_to_hash;	// sha1sum of the paths to hash.
-
 	foreach (QModelIndex index, milSelectionList)
-        if(index.column()==0)    //Get only FileName
-        {
-            RsFileTree tree;
-            recursBuildFileTree(_dirModel->filePath(_tree_proxyModel->mapToSource(index)),tree,tree.root(),recursive,paths_to_hash);
+	{
 
-            mCollection->merge_in(tree);
+		if (index.column()==0){//Get only FileName
+			QString filePath = _dirModel->filePath(_tree_proxyModel->mapToSource(index));
+			QFileInfo fileInfo = filePath;
+			if (fileInfo.isDir()) {
+				dirToAdd.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
+				++count;
+				if (recursive) {
+					if (!addAllChild(fileInfo, dirToAdd, fileToHash, count)) return;
+				} else {
+					continue;
+				}
+			}
+			if (fileInfo.isFile()){
+				fileToHash.append(fileInfo.absoluteFilePath());
+				++count;
+				if (dirToAdd.contains(fileInfo.absolutePath()))
+					_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
+				else
+					_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),"");
+			}
 		}
+	}
 
-    mFilesBeingHashed.insert(paths_to_hash.begin(),paths_to_hash.end());
+	// Process Dirs
+	QTreeWidgetItem *item = NULL;
+	if (!ui._fileEntriesTW->selectedItems().empty())
+		item= ui._fileEntriesTW->selectedItems().at(0);
+	if (item) {
+		while (item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR) {
+			item = item->parent();//Only Dir as Parent
+		}
+	}
 
-    QStringList paths;
-    std::list<RsFileHash> hashes;
+	int index = 0;
+	while (index < dirToAdd.count())
+	{
+		ColFileInfo root;
+		if (item && (item != getRootItem())) {
+			root.name = "";
+			root.path = item->text(COLUMN_FILEPATH);
+		} else {
+			root.name = "";
+			root.path = "";
+		}
+		//QMap is ordered, so we get parent before child
+		//Iterator is moved inside this function
+		processItem(dirToAdd, index, root);
+	}
 
-    for(auto it:paths_to_hash)
-    {
-        paths.push_back(it.first);
-        hashes.push_back(it.second);
+	//Update liste before attach files to be sure when file is hashed, parent directory exists.
+	updateList();
 
-        std::cerr << "Setting file has being hased: ID=" << it.second << " - " << it.first.toUtf8().constData() << std::endl;
-    }
+	for (QHash<QString,QString>::Iterator it = _listOfFilesAddedInDir.begin(); it != _listOfFilesAddedInDir.end() ; ++it)
+	{
+		QString path = it.value();
+		//it.value() = "";//Don't reset value, could be an older attachment not terminated.
+		if (dirToAdd.contains(path)){
+			it.value() = dirToAdd.value(path);
+		} else if(item) {
+			if (item->data(COLUMN_HASH, ROLE_NAME) != "") {
+				it.value() = item->text(COLUMN_FILEPATH);
+			}
+		}
+	}
 
-    mCollectionModel->notifyFilesBeingHashed(hashes);
-    mCollectionModel->postMods();
+	// Process Files once all done
+	ui._hashBox->addAttachments(fileToHash,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
+}
 
-    ui._hashBox->addAttachments(paths,RS_FILE_REQ_ANONYMOUS_ROUTING /*, 0*/);
-
-    if(!mFilesBeingHashed.empty())
-    {
-        ui._save_PB->setToolTip(tr("Please wait for all files to be properly processed before saving."));
-        ui._save_PB->setEnabled(false);
-    }
+/**
+ * @brief RsCollectionDialog::addAllChild: Add children to RsCollection
+ * @param fileInfoParent: Parent's QFileInfo to scan
+ * @param dirToAdd: QMap where directories are added
+ * @param fileToHash: QStringList where files are added
+ * @return false if too many items is selected and aborted
+ */
+bool RsCollectionDialog::addAllChild(QFileInfo &fileInfoParent
+                                     , QMap<QString, QString > &dirToAdd
+                                     , QStringList &fileToHash
+                                     , int &count)
+{
+	//Save count only first time to not scan all items on list .count()
+	if (count == 0) count = (dirToAdd.count() + fileToHash.count());
+	QDir dirParent = fileInfoParent.absoluteFilePath();
+	dirParent.setFilter(QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot);
+	QFileInfoList childrenList = dirParent.entryInfoList();
+	foreach (QFileInfo fileInfo, childrenList)
+	{
+		if (count == MAX_FILE_ADDED_BEFORE_ASK)
+		{
+			QMessageBox msgBox;
+			msgBox.setText(tr("Warning, selection contains more than %1 items.").arg(MAX_FILE_ADDED_BEFORE_ASK));
+			msgBox.setInformativeText("Do you want to continue?");
+			msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+			msgBox.setDefaultButton(QMessageBox::No);
+			int ret = msgBox.exec();
+			switch (ret) {
+				case QMessageBox::Yes:
+				break;
+				case QMessageBox::No:
+					return false;
+				break;
+				break;
+				default:
+					// should never be reached
+				break;
+			}
+		}
+		if (fileInfo.isDir()) {
+			dirToAdd.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
+			++count;
+			if (!addAllChild(fileInfo, dirToAdd, fileToHash, count)) return false;
+		}
+		if (fileInfo.isFile()){
+			fileToHash.append(fileInfo.absoluteFilePath());
+			++count;
+			if (dirToAdd.contains(fileInfo.absolutePath()))
+				_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),fileInfo.absolutePath());
+			else
+				_listOfFilesAddedInDir.insert(fileInfo.absoluteFilePath(),"");
+		}
+	}
+	return true;
 }
 
 /**
@@ -598,26 +897,172 @@ void RsCollectionDialog::addSelection(bool recursive)
  */
 void RsCollectionDialog::remove()
 {
-    QMap<QString, QString > dirToRemove;
-    int count=0;//to not scan all items on list .count()
+	bool removeOnlyFile=false;
+	QString listDir;
+	// First, check if selection contains directories
+	for (int curs = 0; curs < ui._fileEntriesTW->selectedItems().count(); ++curs)
+	{// Have to call ui._fileEntriesTW->selectedItems().count() each time as selected could change
+		QTreeWidgetItem *item = NULL;
+		item= ui._fileEntriesTW->selectedItems().at(curs);
 
-    QModelIndexList milSelectionList =	ui._fileEntriesTW->selectionModel()->selectedIndexes();
+		//Uncheck child directory item if parent is checked
+		if (item != getRootItem()){
+			if (item->data(COLUMN_HASH, ROLE_TYPE).toUInt() == DIR_TYPE_DIR) {
+				QString path = item->data(COLUMN_HASH, ROLE_PATH).toString();
+				if (listDir.contains(path) && !path.isEmpty()) {
+					item->setSelected(false);
+				} else {
+					listDir += item->data(COLUMN_HASH, ROLE_NAME).toString() +"<br>";
+				}
+			}
+		}
+	}
 
-    mCollectionModel->preMods();
+	//If directories, ask to remove them or not
+	if (!listDir.isEmpty()){
+		QMessageBox* msgBox = new QMessageBox(QMessageBox::Information, "", "");
+		msgBox->setText("Warning, selection contains directories.");
+		//msgBox->setInformativeText(); If text too long, no scroll, so I add an text edit
+		QGridLayout* layout = qobject_cast<QGridLayout*>(msgBox->layout());
+		if (layout) {
+			int newRow = 1;
+			for (int row = layout->count()-1; row >= 0; --row) {
+				for (int col = layout->columnCount()-1; col >= 0; --col) {
+					QLayoutItem *item = layout->itemAtPosition(row, col);
+					if (item) {
+						int index = layout->indexOf(item->widget());
+						int r=0, c=0, rSpan=0, cSpan=0;
+						layout->getItemPosition(index, &r, &c, &rSpan, &cSpan);
+						if (r>0) {
+							layout->removeItem(item);
+							layout->addItem(item, r+3, c, rSpan, cSpan);
+						} else if (rSpan>1) {
+							newRow = rSpan + 1;
+						}
+					}
+				}
+			}
+			QLabel *label = new QLabel(tr("Do you want to remove them and all their children, too?"));
+			layout->addWidget(label,newRow, 0, 1, layout->columnCount(), Qt::AlignHCenter );
+			QTextEdit *edit = new QTextEdit(listDir);
+			edit->setReadOnly(true);
+			edit->setWordWrapMode(QTextOption::NoWrap);
+			layout->addWidget(edit,newRow+1, 0, 1, layout->columnCount(), Qt::AlignHCenter );
+		}
 
-    foreach (QModelIndex index, milSelectionList)
-        if(index.column()==0)    //Get only FileName
-        {
-            auto indx = mCollectionModel->getIndex(index);
-            auto parent_indx = mCollectionModel->getIndex(index.parent());
+		msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+		msgBox->setDefaultButton(QMessageBox::Yes);
+		int ret = msgBox->exec();
+		switch (ret) {
+			case QMessageBox::Yes:
+			break;
+			case QMessageBox::No:
+				removeOnlyFile = true;
+			break;
+			case QMessageBox::Cancel: {
+				delete msgBox;
+				return;
+			}
+			break;
+			default:
+				// should never be reached
+			break;
+		}
+		delete msgBox;
+	}
 
-            if(indx.is_file)
-                mCollection->removeFile(indx.index,parent_indx.index);
-            else
-                mCollection->removeDirectory(indx.index,parent_indx.index);
-        }
+	//Remove wanted items
+	int leftItem = 0;
+	// Have to call ui._fileEntriesTW->selectedItems().count() each time as selected change
+	while (ui._fileEntriesTW->selectedItems().count() > leftItem) {
+		QTreeWidgetItem *item = ui._fileEntriesTW->selectedItems().at(leftItem);
 
-    mCollectionModel->postMods();
+		if (item != getRootItem()){
+			if (!removeItem(item, removeOnlyFile)) {
+				++leftItem;
+			}
+		} else {
+			//Get Root change index
+			++leftItem;
+		}
+	}
+
+	updateSizes() ;
+
+}
+
+bool RsCollectionDialog::removeItem(QTreeWidgetItem *item, bool &removeOnlyFile)
+{
+	if (item){
+		if ((item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR) || !removeOnlyFile) {
+			int leftItem = 0;
+			while (item->childCount() > leftItem) {
+				if (!removeItem(item->child(0), removeOnlyFile)) {
+					++leftItem;
+				}
+			}
+			if (leftItem == 0) {
+				//First uncheck item to update parent informations
+				item->setCheckState(COLUMN_FILE,Qt::Unchecked);
+				QTreeWidgetItem *parent = item->parent();
+				if (parent) {
+					parent->removeChild(item);
+				} else {
+					getRootItem()->removeChild(item);
+				}
+				return true;
+			} else {
+				if (!removeOnlyFile) {
+					std::cerr << "(EE) RsCollectionDialog::removeItem This could never happen." << std::endl;
+				}
+			}
+		}
+	}
+	return false;
+}
+
+/** Process each item to make a new RsCollection item */
+void RsCollectionDialog::processItem(QMap<QString, QString> &dirToAdd
+                                     , int &index
+                                     , ColFileInfo &parent
+                                     )
+{
+	ColFileInfo newChild;
+	int count = dirToAdd.count();
+	if (index < count) {
+		QString key=dirToAdd.keys().at(index);
+		bool bad_chars_detected = false;
+		QFileInfo fileInfo=key;
+		QString cleanDirName = purifyFileName(fileInfo.fileName(),bad_chars_detected);
+		newChild.name = cleanDirName;
+		newChild.filename_has_wrong_characters = bad_chars_detected;
+		newChild.size = fileInfo.isDir()? 0: fileInfo.size();
+		newChild.type = fileInfo.isDir()? DIR_TYPE_DIR: DIR_TYPE_FILE ;
+		if (parent.name != "") {
+			newChild.path = parent.path + "/" + parent.name;
+		} else {
+			newChild.path = parent.path;
+		}
+		dirToAdd[key] = newChild.path + "/" + newChild.name;
+		//Move to next item
+		++index;
+		if (index < count){
+			QString newKey = dirToAdd.keys().at(index);
+			while ((dirToAdd.value(newKey) == key)
+			       && (index < count)) {
+				processItem(dirToAdd, index, newChild);
+				if (index < count)newKey = dirToAdd.keys().at(index);
+			}
+		}
+
+		//Save parent when child are processed
+		if (parent.name != "") {
+			parent.children.push_back(newChild);
+			parent.size += newChild.size;
+		} else {
+			_newColFileInfos.push_back(newChild);
+		}
+	}
 }
 
 /**
@@ -625,31 +1070,119 @@ void RsCollectionDialog::remove()
  */
 void RsCollectionDialog::makeDir()
 {
-    QModelIndexList selected_indices = ui._fileEntriesTW->selectionModel()->selectedIndexes();
+	QString childName="";
+	bool ok, badChar, nameOK = false;
+	// Ask for name
+	while (!nameOK)
+	{
+		childName = QInputDialog::getText(this, tr("New Directory")
+		                                  , tr("Enter the new directory's name")
+		                                  , QLineEdit::Normal, childName, &ok);
+		if (ok && !childName.isEmpty())
+		{
+			childName = purifyFileName(childName, badChar);
+			nameOK = !badChar;
+			if (badChar)
+			{
+				QMessageBox msgBox;
+				msgBox.setText("The name contains bad characters.");
+				msgBox.setInformativeText("Do you want to use the corrected one?\n" + childName);
+				msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Retry | QMessageBox::Cancel);
+				msgBox.setDefaultButton(QMessageBox::Ok);
+				int ret = msgBox.exec();
+				switch (ret) {
+					case QMessageBox::Ok:
+						nameOK = true;
+					break;
+					case QMessageBox::Retry:
+					break;
+					case QMessageBox::Cancel:
+						return;
+					break;
+					default:
+						// should never be reached
+					break;
+				}
+			}
+		} else {//if (ok && !childName.isEmpty())
+			return;
+		}
 
-    if(selected_indices.size() > 1)
-    {
-        QMessageBox::information(nullptr,tr("Too many places selected"),tr("Please select at most one directory where to create the new folder"));
-        return;
-    }
+	}
 
-    QModelIndex place_index;
 
-    if(!selected_indices.empty())
-        place_index = selected_indices.first();
+	QList<QTreeWidgetItem*> selected = ui._fileEntriesTW->selectedItems();
 
-    RsCollectionModel::EntryIndex e = mCollectionModel->getIndex(place_index);
+	if(selected.empty())
+	{
+		QTreeWidgetItem *item = getRootItem();
 
-    if(e.is_file)
-    {
-        QMessageBox::information(nullptr,tr("Selected place cannot be a file"),tr("Please select at most one directory where to create the new folder"));
-        return;
-    }
-    QString childName = QInputDialog::getText(this, tr("New Directory"), tr("Enter the new directory's name"), QLineEdit::Normal);
+		ColFileInfo newChild;
+		newChild.name = childName;
+		newChild.filename_has_wrong_characters = false;
+		newChild.size = 0;
+		newChild.type = DIR_TYPE_DIR;
+		newChild.path = item->data(COLUMN_HASH, ROLE_PATH).toString()
+		        + "/" + item->data(COLUMN_HASH, ROLE_NAME).toString();
+		if (item == getRootItem()) newChild.path = "";
 
-    mCollectionModel->preMods();
-    mCollection->merge_in(*RsFileTree::fromDirectory(childName.toUtf8().constData()),e.index);
-    mCollectionModel->postMods();
+		_newColFileInfos.push_back(newChild);
+	}
+	else
+		for(auto it(selected.begin());it!=selected.end();++it)
+		{
+			QTreeWidgetItem *item = *it;
+
+			while(item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR)
+				item = item->parent();//Only Dir as Parent
+
+			ColFileInfo newChild;
+			newChild.name = childName;
+			newChild.filename_has_wrong_characters = false;
+			newChild.size = 0;
+			newChild.type = DIR_TYPE_DIR;
+
+			if (item == getRootItem())
+				newChild.path = "";
+			else
+				newChild.path = item->data(COLUMN_HASH, ROLE_PATH).toString() + "/" + item->data(COLUMN_HASH, ROLE_NAME).toString();
+
+			_newColFileInfos.push_back(newChild);
+		}
+
+
+//	// Process all selected items
+//	int count = ui._fileEntriesTW->selectedItems().count();
+//	int curs = 0;
+//	if (count == 0) curs = -1;
+//
+//	for (; curs < count; ++curs)
+//	{
+//		QTreeWidgetItem *item = NULL;
+//		if (curs >= 0) {
+//			item= ui._fileEntriesTW->selectedItems().at(curs);
+//		} else {
+//			item = getRootItem();
+//		}
+//		if (item) {
+//			while (item->parent() != NULL && item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR) {
+//				item = item->parent();//Only Dir as Parent
+//			}
+//			ColFileInfo newChild;
+//			newChild.name = childName;
+//			newChild.filename_has_wrong_characters = false;
+//			newChild.size = 0;
+//			newChild.type = DIR_TYPE_DIR;
+//			newChild.path = item->data(COLUMN_HASH, ROLE_PATH).toString()
+//			                + "/" + item->data(COLUMN_HASH, ROLE_NAME).toString();
+//			if (item == getRootItem()) newChild.path = "";
+//
+//			_newColFileInfos.push_back(newChild);
+//		}
+//	}
+
+
+	updateList();
 }
 
 /**
@@ -659,34 +1192,156 @@ void RsCollectionDialog::makeDir()
  */
 void RsCollectionDialog::fileHashingFinished(QList<HashedFile> hashedFiles)
 {
-    // build a map of old-hash to new-hash for the hashed files, so that it can be passed to the mCollection for update
+	std::cerr << "RsCollectionDialog::fileHashingFinished() started." << std::endl;
 
-    mCollectionModel->preMods();
-    std::map<RsFileHash,RsFileHash> old_to_new_hashes;
+	QString message;
 
-    for(auto f:hashedFiles)
-    {
-        auto it = mFilesBeingHashed.find(f.filepath);
+	QList<HashedFile>::iterator it;
+	for (it = hashedFiles.begin(); it != hashedFiles.end(); ++it) {
+		HashedFile& hashedFile = *it;
 
-        if(it == mFilesBeingHashed.end())
-        {
-            RsErr() << "Could not find hash-ID correspondence for path " << f.filepath.toUtf8().constData() << ". This is a bug." << std::endl;
-            continue;
-        }
-        std::cerr << "Will update old hash " << it->second << " to new hash " << f.hash << std::endl;
+		ColFileInfo colFileInfo;
+		colFileInfo.name=hashedFile.filename;
+		colFileInfo.path="";
+		colFileInfo.size=hashedFile.size;
+		colFileInfo.hash=QString::fromStdString(hashedFile.hash.toStdString());
+		colFileInfo.filename_has_wrong_characters=false;
+		colFileInfo.type=DIR_TYPE_FILE;
 
-        old_to_new_hashes.insert(std::make_pair(it->second,f.hash));
-        mFilesBeingHashed.erase(it);
-        mCollectionModel->fileHashingFinished(it->second);
-    }
-    mCollection->updateHashes(old_to_new_hashes);
-    mCollectionModel->postMods();
+		if(_listOfFilesAddedInDir.value(hashedFile.filepath,"")!="") {
+			//File Added in directory, find its parent
+			colFileInfo.path = _listOfFilesAddedInDir.value(hashedFile.filepath,"");
+			_listOfFilesAddedInDir.remove(hashedFile.filepath);
+		}
 
-    if(mFilesBeingHashed.empty())
-    {
-        ui._save_PB->setToolTip(tr(""));
-        ui._save_PB->setEnabled(true);
-    }
+		_newColFileInfos.push_back(colFileInfo);
+
+	}
+
+	std::cerr << "RsCollectionDialog::fileHashingFinished message : " << message.toStdString() << std::endl;
+
+	updateList();
+}
+
+void RsCollectionDialog::itemChanged(QTreeWidgetItem *item, int col)
+{
+	if (col != COLUMN_FILE) return;
+
+	if (item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_FILE) return;
+
+	//In COLUMN_FILE, normaly, only checkState could change...
+	qulonglong size = item->data(COLUMN_SIZE, ROLE_SIZE).toULongLong();
+	bool unchecked = (item->checkState(COLUMN_FILE) == Qt::Unchecked);
+	item->setData(COLUMN_SIZE, ROLE_SELSIZE, unchecked?0:size);
+	item->setText(COLUMN_SIZE, misc::friendlyUnit(unchecked?0:size));
+	item->setData(COLUMN_FILEC, ROLE_SELFILEC, unchecked?0:1);
+	item->setText(COLUMN_FILEC, QString("%1").arg(unchecked?0:1));
+
+	//update parents size
+	QTreeWidgetItem *itemParent = item->parent();
+	while (itemParent) {
+		//When unchecked only remove selected size
+		qulonglong parentSize = itemParent->data(COLUMN_SIZE, ROLE_SELSIZE).toULongLong() + (unchecked?0-size:size);
+		itemParent->setData(COLUMN_SIZE, ROLE_SELSIZE, parentSize);
+		itemParent->setText(COLUMN_SIZE, misc::friendlyUnit(parentSize));
+
+		qulonglong parentFileCount = itemParent->data(COLUMN_FILEC, ROLE_SELFILEC).toULongLong() + (unchecked?0-1:1);
+		itemParent->setData(COLUMN_FILEC, ROLE_SELFILEC, parentFileCount);
+		itemParent->setText(COLUMN_FILEC, QString("%1").arg(parentFileCount));
+
+		itemParent = itemParent->parent();
+	}
+
+	updateSizes() ;
+
+}
+
+/**
+ * @brief RsCollectionDialog::updateRemoveDuplicate Remove all duplicate file when checked.
+ * @param checked
+ */
+void RsCollectionDialog::updateRemoveDuplicate(bool checked)
+{
+	if (checked) {
+		bool bRemoveAll = false;
+		QTreeWidgetItemIterator it(ui._fileEntriesTW);
+		QTreeWidgetItem *item;
+		while ((item = *it) != NULL) {
+			++it;
+			if (item->data(COLUMN_HASH, ROLE_TYPE).toUInt() != DIR_TYPE_DIR) {
+				QList<QTreeWidgetItem*> founds;
+				founds << ui._fileEntriesTW->findItems(item->text(COLUMN_HASH), Qt::MatchExactly | Qt::MatchRecursive, COLUMN_HASH);
+				if (founds.count() > 1) {
+					bool bRemove = false;
+					if (!bRemoveAll) {
+						QMessageBox* msgBox = new QMessageBox(QMessageBox::Information, "", "");
+						msgBox->setText("Warning, duplicate file found.");
+						//msgBox->setInformativeText(); If text too long, no scroll, so I add an text edit
+						msgBox->setStandardButtons(QMessageBox::YesToAll | QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+						msgBox->setDefaultButton(QMessageBox::Yes);
+
+						QGridLayout* layout = qobject_cast<QGridLayout*>(msgBox->layout());
+						if (layout) {
+							int newRow = 1;
+							for (int row = layout->count()-1; row >= 0; --row) {
+								for (int col = layout->columnCount()-1; col >= 0; --col) {
+									QLayoutItem *item = layout->itemAtPosition(row, col);
+									if (item) {
+										int index = layout->indexOf(item->widget());
+										int r=0, c=0, rSpan=0, cSpan=0;
+										layout->getItemPosition(index, &r, &c, &rSpan, &cSpan);
+										if (r>0) {
+											layout->removeItem(item);
+											layout->addItem(item, r+3, c, rSpan, cSpan);
+										} else if (rSpan>1) {
+											newRow = rSpan + 1;
+										}
+									}
+								}
+							}
+							QLabel *label = new QLabel(tr("Do you want to remove this file from the list?"));
+							layout->addWidget(label,newRow, 0, 1, layout->columnCount(), Qt::AlignHCenter );
+							QTextEdit *edit = new QTextEdit(item->text(COLUMN_FILEPATH));
+							edit->setReadOnly(true);
+							edit->setWordWrapMode(QTextOption::NoWrap);
+							layout->addWidget(edit,newRow+1, 0, 1, layout->columnCount(), Qt::AlignHCenter );
+						}
+
+						int ret = msgBox->exec();
+						switch (ret) {
+							case QMessageBox::YesToAll: {
+								bRemoveAll = true;
+							}
+							break;
+							case QMessageBox::Yes: {
+								bRemove = true;
+							}
+							break;
+							case QMessageBox::No:
+							break;
+							case QMessageBox::Cancel: {
+								delete msgBox;
+								ui._removeDuplicate_CB->setChecked(false);
+								return;
+							}
+							break;
+							default:
+								// should never be reached
+							break;
+						}
+						delete msgBox;
+					}
+
+					if (bRemove || bRemoveAll) {
+							//First uncheck item to update parent informations
+							item->setCheckState(COLUMN_FILE,Qt::Unchecked);
+							item->parent()->removeChild(item);
+					}
+
+				}
+			}
+		}
+	}
 }
 
 /**
@@ -704,85 +1359,47 @@ void RsCollectionDialog::cancel()
 void RsCollectionDialog::download()
 {
 	std::cerr << "Downloading!" << std::endl;
-    bool auto_correct = false;
-    bool auto_skip = false;
 
 	QString dldir = ui.downloadFolder_LE->text();
 
 	std::cerr << "downloading all these files:" << std::endl;
 
-    std::function<void(RsFileTree::DirIndex,const std::string&)> recursDL = [&](RsFileTree::DirIndex index,const std::string& path)
-    {
-        const auto& dirdata(mCollection->fileTree().directoryData(index));
-        RsCollectionModel::EntryIndex e;
+	QTreeWidgetItemIterator itemIterator(ui._fileEntriesTW);
+	QTreeWidgetItem *item;
+	while ((item = *itemIterator) != NULL) {
+		++itemIterator;
 
-        for(uint32_t i=0;i<dirdata.subdirs.size();++i)
-        {
-            e.index = dirdata.subdirs[i];
-            e.is_file = false;
+		if (item->checkState(COLUMN_FILE) == Qt::Checked) {
+			std::cerr << item->data(COLUMN_HASH,ROLE_NAME).toString().toStdString()
+			          << " " << item->text(COLUMN_HASH).toStdString()
+			          << " " << item->text(COLUMN_SIZE).toStdString()
+			          << " " << item->data(COLUMN_HASH,ROLE_PATH).toString().toStdString() << std::endl;
+			ColFileInfo colFileInfo;
+			colFileInfo.hash = item->text(COLUMN_HASH);
+			colFileInfo.name = item->data(COLUMN_HASH,ROLE_NAME).toString();
+			colFileInfo.path = item->data(COLUMN_HASH,ROLE_PATH).toString();
+			colFileInfo.type = item->data(COLUMN_HASH,ROLE_TYPE).toUInt();
+			colFileInfo.size = item->data(COLUMN_SIZE,ROLE_SELSIZE).toULongLong();
 
-            if(!mCollectionModel->isChecked(e))
-                continue;
+			QString cleanPath = dldir + colFileInfo.path ;
+			std::cerr << "making directory " << cleanPath.toStdString() << std::endl;
 
-            const auto& sdd = mCollection->fileTree().directoryData(e.index);
-            std::string subpath = RsDirUtil::makePath(path,sdd.name);
+			if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath))
+				QMessageBox::warning(NULL,QObject::tr("Unable to make path"),QObject::tr("Unable to make path:")+"<br>  "+cleanPath) ;
 
-            std::cerr << "Creating subdir " << sdd.name << " to directory " << path << std::endl;
+			if (colFileInfo.type==DIR_TYPE_FILE)
+				rsFiles->FileRequest(colFileInfo.name.toUtf8().constData(),
+				                     RsFileHash(colFileInfo.hash.toStdString()),
+				                     colFileInfo.size,
+				                     cleanPath.toUtf8().constData(),
+				                     RS_FILE_REQ_ANONYMOUS_ROUTING,
+				                     std::list<RsPeerId>());
+		} else {//if (item->checkState(COLUMN_FILE) == Qt::Checked)
+			std::cerr<<"Skipping file : " << item->data(COLUMN_HASH,ROLE_NAME).toString().toStdString() << std::endl;
+		}
+	}
 
-            if(!QDir(QApplication::applicationDirPath()).mkpath(QString::fromUtf8(subpath.c_str())))
-                QMessageBox::warning(NULL,tr("Unable to make path"),tr("Unable to make path:")+"<br>  "+QString::fromUtf8(subpath.c_str())) ;
-
-            recursDL(dirdata.subdirs[i],subpath);
-        }
-        for(uint32_t i=0;i<dirdata.subfiles.size();++i)
-        {
-            e.index = dirdata.subfiles[i];
-            e.is_file = true;
-
-            if(!mCollectionModel->isChecked(e))
-                continue;
-
-            std::string subpath = RsDirUtil::makePath(path,dirdata.name);
-            const auto& f(mCollection->fileTree().fileData(dirdata.subfiles[i]));
-
-            std::string corrected_name;
-
-            if(!checkFileName(f.name,corrected_name) && !auto_correct)
-            {
-                if(auto_skip)
-                    continue;
-
-                QMessageBox mb;
-                mb.setText(tr("Incompatible filename."));
-                mb.setInformativeText(tr("This filename is not usable on your system.")+"\n"+tr("Retroshare can replace every problematic chars by '_'.")
-                                      +"\n"+tr("What do you want to do?"));
-                QAbstractButton *btnCorrect = mb.addButton(tr("Correct filename"), QMessageBox::YesRole);
-                QAbstractButton *btnCorrectAll = mb.addButton(tr("Correct all"), QMessageBox::AcceptRole);
-                QAbstractButton *btnSkip = mb.addButton(tr("Skip this file"), QMessageBox::NoRole);
-                QAbstractButton *btnSkipAll = mb.addButton(tr("Skip all"), QMessageBox::RejectRole);
-                mb.setIcon(QMessageBox::Question);
-                mb.exec();
-
-                if(mb.clickedButton() == btnSkipAll)
-                {
-                    auto_skip = true;
-                    continue;
-                }
-                if(mb.clickedButton() == btnSkip)
-                    continue;
-
-                if(mb.clickedButton() == btnCorrectAll)
-                    auto_correct = true;
-            }
-
-            std::cerr << "Requesting file " << corrected_name << " to directory " << path << std::endl;
-
-            rsFiles->FileRequest(corrected_name,f.hash,f.size,path,RS_FILE_REQ_ANONYMOUS_ROUTING,std::list<RsPeerId>());
-        }
-    };
-
-    recursDL(mCollection->fileTree().root(),dldir.toUtf8().constData());
-    close();
+	close();
 }
 
 /**
@@ -790,66 +1407,40 @@ void RsCollectionDialog::download()
  */
 void RsCollectionDialog::save()
 {
-    if(ui._filename_TL->text().isNull())
-        changeFileName();
-    if(ui._filename_TL->text().isNull())
-        return;
+	std::cerr << "Saving!" << std::endl;
+	_newColFileInfos.clear();
+	QTreeWidgetItem* root = getRootItem();
+	if (root) {
+		saveChild(root);
 
-    mCollectionModel->preMods();
-    mCollection->cleanup();
-    mCollection->save(ui._filename_TL->text());
-    close();
+		emit saveColl(_newColFileInfos, _fileName);
+	}
+	close();
 }
 
-bool RsCollectionDialog::editExistingCollection(const QString& fileName, bool showError /* = true*/)
+/**
+ * @brief RsCollectionDialog::saveChild: Save each child in _newColFileInfos
+ * @param parent
+ */
+void RsCollectionDialog::saveChild(QTreeWidgetItem *parentItem, ColFileInfo *parentInfo)
 {
-    return RsCollectionDialog(fileName,EDIT).exec();
+	ColFileInfo parent;
+	if (!parentInfo) parentInfo = &parent;
+
+	parentInfo->checked = (parentItem->checkState(COLUMN_FILE)==Qt::Checked);
+	parentInfo->hash = parentItem->text(COLUMN_HASH);
+	parentInfo->name = parentItem->data(COLUMN_HASH,ROLE_NAME).toString();
+	parentInfo->path = parentItem->data(COLUMN_HASH,ROLE_PATH).toString();
+	parentInfo->type = parentItem->data(COLUMN_HASH,ROLE_TYPE).toUInt();
+	parentInfo->size = parentItem->data(COLUMN_SIZE,ROLE_SELSIZE).toULongLong();
+
+	for (int i=0; i<parentItem->childCount(); ++i) {
+		ColFileInfo child;
+		saveChild(parentItem->child(i), &child);
+		if (parentInfo->name != "") {
+			parentInfo->children.push_back(child);
+		} else {
+			_newColFileInfos.push_back(child);
+		}
+	}
 }
-
-bool RsCollectionDialog::openExistingCollection(const QString& fileName, bool showError /* = true*/)
-{
-    return RsCollectionDialog(fileName,DOWNLOAD).exec();
-}
-
-bool RsCollectionDialog::downloadFiles(const RsCollection &collection)
-{
-    return RsCollectionDialog(collection,DOWNLOAD).exec();
-}
-
-
-bool RsCollectionDialog::openNewCollection(const RsFileTree& tree)
-{
-    RsCollection collection(tree);
-    QString fileName;
-
-    if(!misc::getSaveFileName(nullptr, RshareSettings::LASTDIR_EXTRAFILE
-                                                        , QApplication::translate("RsCollectionFile", "Create collection file")
-                                                        , QApplication::translate("RsCollectionFile", "Collection files") + " (*." + RsCollection::ExtensionString + ")"
-                                                        , fileName,0, QFileDialog::DontConfirmOverwrite))
-        return false;
-
-    if (!fileName.endsWith("." + RsCollection::ExtensionString))
-        fileName += "." + RsCollection::ExtensionString ;
-
-    std::cerr << "Got file name: " << fileName.toStdString() << std::endl;
-
-    if(QFile(fileName).exists())
-    {
-        QMessageBox mb;
-        mb.setText(tr("Save Collection File."));
-        mb.setInformativeText(tr("File already exists.")+"\n"+tr("What do you want to do?"));
-        QAbstractButton *btnOwerWrite = mb.addButton(tr("Overwrite"), QMessageBox::YesRole);
-        QAbstractButton *btnCancel = mb.addButton(tr("Cancel"), QMessageBox::ResetRole);
-        mb.setIcon(QMessageBox::Question);
-        mb.exec();
-
-        if (mb.clickedButton()==btnCancel)
-            return false;
-    }
-
-    if(!collection.save(fileName))
-        return false;
-
-    return RsCollectionDialog(fileName,EDIT).exec();
-}
-
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.h b/retroshare-gui/src/gui/common/RsCollectionDialog.h
index 3c1f5c29a..43c7dbdd7 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.h
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.h
@@ -18,10 +18,8 @@
  *                                                                             *
  *******************************************************************************/
 
-#include <set>
 #include "ui_RsCollectionDialog.h"
 #include "RsCollection.h"
-#include "RsCollectionModel.h"
 #include <QFileSystemModel>
 #include <QSortFilterProxyModel>
 
@@ -32,45 +30,33 @@ class RsCollectionDialog: public QDialog
 	Q_OBJECT
 
 public:
+	RsCollectionDialog(const QString& filename
+	                   , const std::vector<ColFileInfo> &colFileInfos
+	                   , const bool& creation
+	                   , const bool& readOnly = false) ;
 	virtual ~RsCollectionDialog();
 
-    // Open new collection
-    static bool openNewCollection(const RsFileTree &tree = RsFileTree());
-
-    // Edit existing collection
-    static bool editExistingCollection(const QString& fileName, bool showError = true);
-
-    // Open existing collection for download
-    static bool openExistingCollection(const QString& fileName, bool showError = true);
-
-    // Open existing collection for download
-    static bool downloadFiles(const RsCollection& collection);
 protected:
-    static QString errorString(RsCollection::RsCollectionErrorCode code);
-
-    void init(const QString& collectionFileName);
-
-    enum RsCollectionDialogMode {
-        UNKNOWN       = 0x00,
-        EDIT          = 0x01,
-        DOWNLOAD      = 0x02,
-    };
-
-    RsCollectionDialog(const QString& filename, RsCollectionDialogMode mode) ;
-    RsCollectionDialog(const RsCollection& coll, RsCollectionDialogMode mode) ;
+	bool eventFilter(QObject *obj, QEvent *ev);
 
 private slots:
 	void directoryLoaded(QString dirLoaded);
 	void updateSizes() ;
 	void changeFileName() ;
-    void addSelection() ;
-    void addSelectionRecursive() ;
+	void add() ;
+	void addRecursive() ;
 	void remove() ;
 	void chooseDestinationDirectory();
 	void setDestinationDirectory();
 	void openDestinationDirectoryMenu();
+	void processItem(QMap<QString, QString> &dirToAdd
+	                 , int &index
+                   , ColFileInfo &parent
+                   ) ;
 	void makeDir() ;
 	void fileHashingFinished(QList<HashedFile> hashedFiles) ;
+	void itemChanged(QTreeWidgetItem* item,int col) ;
+	void updateRemoveDuplicate(bool checked);
 	void cancel() ;
 	void download() ;
 	void save() ;
@@ -80,20 +66,26 @@ signals:
 
 private:
 	void processSettings(bool bLoad) ;
-    void addSelection(bool recursive) ;
+	QTreeWidgetItem*  getRootItem();
+	bool updateList();
+	bool addChild(QTreeWidgetItem *parent, const std::vector<ColFileInfo> &child);
+	bool removeItem(QTreeWidgetItem *item, bool &removeOnlyFile) ;
+	void addRecursive(bool recursive) ;
+	bool addAllChild(QFileInfo &fileInfoParent
+	                 , QMap<QString, QString > &dirToAdd
+	                 , QStringList &fileToHash
+	                 , int &count);
+	void saveChild(QTreeWidgetItem *parentItem, ColFileInfo *parentInfo = NULL);
 
 	Ui::RsCollectionDialog ui;
-
-    RsCollectionDialogMode _mode;
+	QString _fileName ;
+	const bool _creationMode ;
+	const bool _readOnly;
+	std::vector<ColFileInfo> _newColFileInfos ;
 
 	QFileSystemModel *_dirModel;
 	QSortFilterProxyModel *_tree_proxyModel;
 	QItemSelectionModel *_selectionProxy;
 	bool _dirLoaded;
 	QHash<QString,QString> _listOfFilesAddedInDir;
-
-    RsCollectionModel *mCollectionModel;
-    RsCollection *mCollection;
-
-    std::map<QString,RsFileHash> mFilesBeingHashed; // map of file path vs. temporary ID used for the file while hashing
 };
diff --git a/retroshare-gui/src/gui/common/RsCollectionDialog.ui b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
index 5ceadb647..d8693ef0a 100644
--- a/retroshare-gui/src/gui/common/RsCollectionDialog.ui
+++ b/retroshare-gui/src/gui/common/RsCollectionDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>761</width>
-    <height>434</height>
+    <width>600</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
@@ -17,7 +17,7 @@
    <string>Collection</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../images.qrc">
     <normaloff>:/images/mimetypes/rscollection-16.png</normaloff>:/images/mimetypes/rscollection-16.png</iconset>
   </property>
   <property name="sizeGripEnabled">
@@ -157,7 +157,7 @@
                   </widget>
                  </item>
                  <item>
-                  <widget class="QToolButton" name="_changeFile">
+                  <widget class="QPushButton" name="_changeFile">
                    <property name="maximumSize">
                     <size>
                      <width>21</width>
@@ -170,10 +170,6 @@
                    <property name="text">
                     <string>...</string>
                    </property>
-                   <property name="icon">
-                    <iconset resource="../icons.qrc">
-                     <normaloff>:/icons/browsable_blue_128.png</normaloff>:/icons/browsable_blue_128.png</iconset>
-                   </property>
                   </widget>
                  </item>
                 </layout>
@@ -287,7 +283,7 @@
                      </property>
                      <property name="icon">
                       <iconset resource="../images.qrc">
-                       <normaloff>:/images/start.png</normaloff>:/images/start.png</iconset>
+                       <normaloff>:/images/feedback_arrow.png</normaloff>:/images/feedback_arrow.png</iconset>
                      </property>
                     </widget>
                    </item>
@@ -313,7 +309,7 @@
                      </property>
                      <property name="icon">
                       <iconset resource="../images.qrc">
-                       <normaloff>:/images/startall.png</normaloff>:/images/startall.png</iconset>
+                       <normaloff>:/images/update.png</normaloff>:/images/update.png</iconset>
                      </property>
                     </widget>
                    </item>
@@ -338,8 +334,8 @@
                       <string notr="true"/>
                      </property>
                      <property name="icon">
-                      <iconset resource="../images.qrc">
-                       <normaloff>:/images/delete.png</normaloff>:/images/delete.png</iconset>
+                      <iconset>
+                       <normaloff>:/images/deletemail24.png</normaloff>:/images/deletemail24.png</iconset>
                      </property>
                     </widget>
                    </item>
@@ -386,7 +382,7 @@
                  </item>
                 </layout>
                </widget>
-               <widget class="QTreeView" name="_fileEntriesTW">
+               <widget class="QTreeWidget" name="_fileEntriesTW">
                 <property name="editTriggers">
                  <set>QAbstractItemView::NoEditTriggers</set>
                 </property>
@@ -402,6 +398,11 @@
                 <property name="allColumnsShowFocus">
                  <bool>true</bool>
                 </property>
+                <column>
+                 <property name="text">
+                  <string notr="true">1</string>
+                 </property>
+                </column>
                </widget>
               </widget>
              </item>
@@ -410,6 +411,26 @@
           </item>
           <item>
            <layout class="QHBoxLayout" name="buttons_HL">
+            <item>
+             <widget class="QCheckBox" name="_removeDuplicate_CB">
+              <property name="text">
+               <string>Remove Duplicate</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="buttons_HSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
             <item>
              <widget class="QLabel" name="downloadFolder_LB">
               <property name="text">
@@ -430,12 +451,6 @@
             </item>
             <item>
              <widget class="QLineEdit" name="downloadFolder_LE">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
               <property name="contextMenuPolicy">
                <enum>Qt::CustomContextMenu</enum>
               </property>
@@ -447,19 +462,6 @@
               </property>
              </widget>
             </item>
-            <item>
-             <spacer name="horizontalSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
             <item>
              <widget class="QPushButton" name="_cancel_PB">
               <property name="text">
@@ -515,7 +517,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
-  <include location="../icons.qrc"/>
+  <include location="../../../../plugins/FeedReader/gui/FeedReader_images.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.cpp b/retroshare-gui/src/gui/common/RsCollectionModel.cpp
deleted file mode 100644
index 8c7fa9283..000000000
--- a/retroshare-gui/src/gui/common/RsCollectionModel.cpp
+++ /dev/null
@@ -1,616 +0,0 @@
-#include <string>
-#include <QBrush>
-
-#include "RsCollectionModel.h"
-
-// #define DEBUG_COLLECTION_MODEL 1
-
-static const int COLLECTION_MODEL_FILENAME  = 0;
-static const int COLLECTION_MODEL_SIZE      = 1;
-static const int COLLECTION_MODEL_HASH      = 2;
-static const int COLLECTION_MODEL_COUNT     = 3;
-static const int COLLECTION_MODEL_NB_COLUMN = 4;
-
-RsCollectionModel::RsCollectionModel(const RsCollection& col, QObject *parent)
-    : QAbstractItemModel(parent),mCollection(col)
-{
-    postMods();
-}
-
-static std::ostream& operator<<(std::ostream& o,const RsCollectionModel::EntryIndex& i)
-{
-    return o << ((i.is_file)?("File"):"Dir") << " with index " << (int)i.index ;
-}
-static std::ostream& operator<<(std::ostream& o,const QModelIndex& i)
-{
-    return o << "QModelIndex (row " << i.row() << ", ref " << i.internalId() << ")" ;
-}
-#ifdef DEBUG_COLLECTION_MODEL
-#endif
-
-// Indernal Id is always a quintptr_t (basically a uint with the size of a pointer). Depending on the
-// Indernal Id is always a quintptr_t (basically a uint with the size of a pointer). Depending on the
-// architecture, the pointer may have 4 or 8 bytes. We use the low-level bit for type (0=dir, 1=file) and
-// the remaining bits for the index (which will be accordingly understood as a FileIndex or a DirIndex)
-// This way, index 0 is always the top dir.
-
-bool RsCollectionModel::convertIndexToInternalId(const EntryIndex& e,quintptr& ref)
-{
-    ref = (e.index << 1) | e.is_file;
-    return true;
-}
-
-bool RsCollectionModel::convertInternalIdToIndex(quintptr ref, EntryIndex& e)
-{
-    e.is_file = (bool)(ref & 1);
-    e.index   = ref >> 1;
-    return true;
-}
-
-int RsCollectionModel::rowCount(const QModelIndex& parent) const
-{
-#ifdef DEBUG_COLLECTION_MODEL
-    std::cerr << "Asking rowCount of " << parent << std::endl;
-#endif
-
-    if(parent.column() >= COLLECTION_MODEL_NB_COLUMN)
-        return 0;
-
-    if(!parent.isValid())
-    {
-#ifdef DEBUG_COLLECTION_MODEL
-        std::cerr << "  root! returning " << mCollection.fileTree().directoryData(0).subdirs.size()
-                + mCollection.fileTree().directoryData(0).subfiles.size() << std::endl;
-#endif
-
-        return    mCollection.fileTree().directoryData(0).subdirs.size()
-                + mCollection.fileTree().directoryData(0).subfiles.size();
-    }
-
-    EntryIndex i;
-    if(!convertInternalIdToIndex(parent.internalId(),i))
-        return 0;
-
-    if(i.is_file)
-    {
-#ifdef DEBUG_COLLECTION_MODEL
-        std::cerr << "  file: returning 0" << std::endl;
-#endif
-        return 0;
-    }
-    else
-    {
-#ifdef DEBUG_COLLECTION_MODEL
-        std::cerr << "  dir: returning " << mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size()
-                  << std::endl;
-#endif
-        return mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size();
-    }
-}
-
-bool RsCollectionModel::hasChildren(const QModelIndex & parent) const
-{
-    if(!parent.isValid())
-        return true;
-
-    EntryIndex i;
-    if(!convertInternalIdToIndex(parent.internalId(),i))
-        return false;
-
-    if(i.is_file)
-        return false;
-    else if(mCollection.fileTree().directoryData(i.index).subdirs.size() + mCollection.fileTree().directoryData(i.index).subfiles.size() > 0)
-        return true;
-    else
-        return false;
-}
-
-int RsCollectionModel::columnCount(const QModelIndex&) const
-{
-    return COLLECTION_MODEL_NB_COLUMN;
-}
-
-QVariant RsCollectionModel::headerData(int section, Qt::Orientation,int role) const
-{
-    if(role == Qt::DisplayRole)
-        switch(section)
-        {
-        case 0: return tr("File");
-        case 1: return tr("Size");
-        case 2: return tr("Hash");
-        case 3: return tr("Count");
-        default:
-            return QVariant();
-        }
-    return QVariant();
-}
-
-QModelIndex RsCollectionModel::index(int row, int column, const QModelIndex & parent) const
-{
-    if(row < 0 || column < 0 || column >= columnCount(parent) || row >= rowCount(parent))
-        return QModelIndex();
-
-    EntryIndex parent_index;
-
-    if(!parent.isValid())	// root
-    {
-        parent_index.is_file = false;
-        parent_index.index = 0;
-    }
-    else if(!convertInternalIdToIndex(parent.internalId(),parent_index))
-        return QModelIndex();
-
-    if(parent_index.is_file || parent_index.index >= mCollection.fileTree().numDirs())
-        return QModelIndex();
-
-    const auto& parentData(mCollection.fileTree().directoryData(parent_index.index));
-
-    if((size_t)row < parentData.subdirs.size())
-    {
-        EntryIndex e;
-        e.is_file = false;
-        e.index = parentData.subdirs[row];
-
-        quintptr ref;
-        convertIndexToInternalId(e,ref);
-
-#ifdef DEBUG_COLLECTION_MODEL
-        std::cerr << "creating index for row " << row << " of parent " << parent << ". result is " << createIndex(row,column,ref) << std::endl;
-#endif
-        return createIndex(row,column,ref);
-    }
-
-    if((size_t)row < parentData.subdirs.size() + parentData.subfiles.size())
-    {
-        EntryIndex e;
-        e.is_file = true;
-        e.index = parentData.subfiles[row - parentData.subdirs.size()];
-
-        quintptr ref;
-        convertIndexToInternalId(e,ref);
-#ifdef DEBUG_COLLECTION_MODEL
-        std::cerr << "creating index for row " << row << " of parent " << parent << ". result is " << createIndex(row,column,ref) << std::endl;
-#endif
-        return createIndex(row,column,ref);
-    }
-
-    return QModelIndex();
-}
-
-Qt::ItemFlags RsCollectionModel::flags ( const QModelIndex & index ) const
-{
-    if(index.isValid() && index.column() == COLLECTION_MODEL_FILENAME)
-    {
-        EntryIndex e;
-
-        if(!convertInternalIdToIndex(index.internalId(),e))
-            return QAbstractItemModel::flags(index) ;
-
-        if(e.is_file)
-            return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
-        else
-            return QAbstractItemModel::flags(index) | Qt::ItemIsAutoTristate | Qt::ItemIsUserCheckable;
-    }
-
-    return QAbstractItemModel::flags(index) ;
-}
-
-QModelIndex RsCollectionModel::parent(const QModelIndex & index) const
-{
-    if(!index.isValid())
-        return QModelIndex();
-
-    EntryIndex i;
-    if(index.internalId()==0 || !convertInternalIdToIndex(index.internalId(),i))
-        return QModelIndex();
-
-    EntryIndex p;
-    p.is_file = false;	// all parents are directories
-    int row;
-
-    if(i.is_file)
-    {
-        p.index = mFileInfos[i.index].parent_index;
-        row = mFileInfos[i.index].parent_row;
-    }
-    else
-    {
-        p.index = mDirInfos[i.index].parent_index;
-        row = mDirInfos[i.index].parent_row;
-    }
-
-    quintptr ref;
-    convertIndexToInternalId(p,ref);
-
-    return createIndex(row,0,ref);
-}
-
-QVariant RsCollectionModel::data(const QModelIndex& index, int role) const
-{
-    EntryIndex i;
-    if(!convertInternalIdToIndex(index.internalId(),i))
-        return QVariant();
-
-#ifdef DEBUG_COLLECTION_MODEL
-    std::cerr << "Asking data of " << i << std::endl;
-#endif
-    switch(role)
-    {
-    case Qt::DisplayRole:    return displayRole(i,index.column());
-    case Qt::DecorationRole: return decorationRole(i,index.column());
-    case Qt::CheckStateRole: return checkStateRole(i,index.column());
-    case Qt::TextColorRole:  return textColorRole(i,index.column());
-    default:
-        return QVariant();
-    }
-}
-
-bool RsCollectionModel::setData(const QModelIndex& index,const QVariant& value,int role)
-{
-    if(!index.isValid())
-        return false;
-
-    EntryIndex e;
-
-    if(role==Qt::CheckStateRole && convertInternalIdToIndex(index.internalId(), e))
-    {
-#ifdef DEBUG_COLLECTION_MODEL
-        std::cerr << "Setting check state of item " << index << " to " << value.toBool() << std::endl;
-#endif
-        RsFileTree::DirIndex dir_index ;
-
-        if(e.is_file)
-        {
-            mFileInfos[e.index].is_checked = value.toBool();
-            dir_index = mFileInfos[e.index].parent_index;
-        }
-        else
-        {
-            std::function<void(RsFileTree::DirIndex,bool)> recursSetCheckFlag = [&](RsFileTree::DirIndex index,bool s) -> void
-            {
-                mDirInfos[index].check_state = (s)?SELECTED:UNSELECTED;
-                auto& dir_data(mCollection.fileTree().directoryData(index));
-
-                mDirInfos[index].total_size = 0;
-                mDirInfos[index].total_count = 0;
-
-                for(uint32_t i=0;i<dir_data.subdirs.size();++i)
-                {
-                    recursSetCheckFlag(dir_data.subdirs[i],s);
-                    mDirInfos[index].total_size += mDirInfos[dir_data.subdirs[i]].total_size ;
-                    mDirInfos[index].total_count+= mDirInfos[dir_data.subdirs[i]].total_count;
-                }
-
-                for(uint32_t i=0;i<dir_data.subfiles.size();++i)
-                {
-                    mFileInfos[dir_data.subfiles[i]].is_checked = s;
-
-                    if(s)
-                    {
-                        mDirInfos[index].total_size += mCollection.fileTree().fileData(dir_data.subfiles[i]).size;
-                        ++mDirInfos[index].total_count;
-                    }
-                }
-            };
-            recursSetCheckFlag(e.index,value.toBool());
-            dir_index = mDirInfos[e.index].parent_index;
-        }
-
-        // now go up the directories and update the check tristate flag, depending on whether the children are all checked/unchecked or mixed.
-
-        do
-        {
-            auto& dit(mDirInfos[dir_index]);
-
-            const RsFileTree::DirData& dir_data(mCollection.fileTree().directoryData(dir_index));	// get the directory data
-
-            bool locally_all_checked = true;
-            bool locally_all_unchecked = true;
-
-            dit.total_size = 0;
-            dit.total_count = 0;
-
-            for(uint32_t i=0;i<dir_data.subdirs.size();++i)
-            {
-                const auto& dit2(mDirInfos[dir_data.subdirs[i]]);
-                dit.total_size += dit2.total_size;
-                dit.total_count += dit2.total_count;
-
-                if(dit2.check_state == UNSELECTED || dit2.check_state == PARTIALLY_SELECTED)
-                    locally_all_checked   = false;
-
-                if(dit2.check_state ==   SELECTED || dit2.check_state == PARTIALLY_SELECTED)
-                    locally_all_unchecked = false;
-            }
-            for(uint32_t i=0;i<dir_data.subfiles.size();++i)
-            {
-                const auto& fit2(mFileInfos[dir_data.subfiles[i]]);
-
-                if(fit2.is_checked)
-                {
-                    dit.total_size += mCollection.fileTree().fileData(dir_data.subfiles[i]).size;
-                    ++dit.total_count;
-                    locally_all_unchecked = false;
-                }
-                else
-                    locally_all_checked = false;
-            }
-
-            if(locally_all_checked)
-                dit.check_state = SELECTED;
-            else if(locally_all_unchecked)
-                dit.check_state = UNSELECTED;
-            else
-                dit.check_state = PARTIALLY_SELECTED;
-
-            if(dir_index == mCollection.fileTree().root())
-                break;
-            else
-                dir_index = dit.parent_index;	// get the directory data
-
-        }
-        while(true);
-
-        const auto& top_dir(mCollection.fileTree().directoryData(mCollection.fileTree().root()));
-        emit dataChanged(createIndex(0,0,(void*)NULL),
-                         createIndex(top_dir.subdirs.size() + top_dir.subfiles.size() - 1,
-                                     COLLECTION_MODEL_NB_COLUMN-1,
-                                     (void*)NULL),
-                         { Qt::CheckStateRole });
-
-        emit sizesChanged();
-
-        return true;
-    }
-    else
-        return QAbstractItemModel::setData(index,value,role);
-}
-
-QVariant RsCollectionModel::textColorRole(const EntryIndex& i,int col) const
-{
-    if(i.is_file && mFilesBeingHashed.find(mCollection.fileTree().fileData(i.index).hash) != mFilesBeingHashed.end())
-        return QVariant(QBrush(QColor::fromRgbF(0.1,0.9,0.2)));
-    else
-        return QVariant();
-}
-QVariant RsCollectionModel::checkStateRole(const EntryIndex& i,int col) const
-{
-    if(col == COLLECTION_MODEL_FILENAME)
-    {
-        if(i.is_file)
-        {
-            if(mFileInfos[i.index].is_checked)
-                return QVariant(Qt::Checked);
-            else
-                return QVariant(Qt::Unchecked);
-        }
-        else
-        {
-            switch(mDirInfos[i.index].check_state)
-            {
-            case SELECTED: return QVariant::fromValue((int)Qt::Checked);
-            case PARTIALLY_SELECTED: return QVariant::fromValue((int)Qt::PartiallyChecked);
-            default:
-            case UNSELECTED: return QVariant::fromValue((int)Qt::Unchecked);
-            }
-        }
-    }
-    else
-        return QVariant();
-}
-QVariant RsCollectionModel::displayRole(const EntryIndex& i,int col) const
-{
-    switch(col)
-    {
-    case COLLECTION_MODEL_FILENAME: if(i.is_file)
-            return QString::fromUtf8(mCollection.fileTree().fileData(i.index).name.c_str());
-        else
-            return QString::fromUtf8(mCollection.fileTree().directoryData(i.index).name.c_str());
-
-    case COLLECTION_MODEL_SIZE: if(i.is_file)
-            return QVariant((qulonglong)mCollection.fileTree().fileData(i.index).size) ;
-        else
-            return QVariant((qulonglong)mDirInfos[i.index].total_size);
-
-    case COLLECTION_MODEL_HASH: if(i.is_file)
-        {
-            if(mFilesBeingHashed.find(mCollection.fileTree().fileData(i.index).hash)!=mFilesBeingHashed.end())
-                return tr("[File is being hashed]");
-            else
-                return QString::fromStdString(mCollection.fileTree().fileData(i.index).hash.toStdString());
-        }
-        else
-            return QVariant();
-
-    case COLLECTION_MODEL_COUNT: if(i.is_file)
-            return (qulonglong)mFileInfos[i.index].is_checked;
-        else
-            return (qulonglong)(mDirInfos[i.index].total_count);
-    }
-    return QVariant();
-}
-QVariant RsCollectionModel::sortRole(const EntryIndex& i,int col) const
-{
-    return QVariant();
-}
-QVariant RsCollectionModel::decorationRole(const EntryIndex& i,int col) const
-{
-    return QVariant();
-}
-
-RsCollectionModel::EntryIndex RsCollectionModel::getIndex(const QModelIndex& i) const
-{
-    EntryIndex res;
-    res.is_file = false;
-    res.index = 0;
-
-    convertInternalIdToIndex(i.internalId(),res);
-    return res;
-}
-bool RsCollectionModel::isChecked(EntryIndex i)
-{
-    if(i.is_file)
-        return mFileInfos[i.index].is_checked;
-    else
-        return mDirInfos[i.index].check_state != DirCheckState::UNSELECTED;
-}
-void RsCollectionModel::notifyFilesBeingHashed(const std::list<RsFileHash>& files)
-{
-    mFilesBeingHashed.insert(files.begin(),files.end());
-}
-void RsCollectionModel::fileHashingFinished(const RsFileHash& hash)
-{
-    mFilesBeingHashed.erase(hash);
-}
-
-void RsCollectionModel::preMods()
-{
-    mUpdating = true;
-    emit layoutAboutToBeChanged();
-}
-void RsCollectionModel::postMods()
-{
-    // update all the local structures
-
-    mDirInfos.clear();
-    mFileInfos.clear();
-
-    mDirInfos.resize(mCollection.fileTree().numDirs());
-    mFileInfos.resize(mCollection.fileTree().numFiles());
-
-    mDirInfos[0].parent_index = 0;
-
-#ifdef DEBUG_COLLECTION_MODEL
-    std::cerr << "Updating from tree: " << std::endl;
-#endif
-    recursUpdateLocalStructures(mCollection.fileTree().root(),0);
-
-    mUpdating = false;
-    emit layoutChanged();
-    emit sizesChanged();
-
-//    debugDump();
-}
-
-void RsCollectionModel::recursUpdateLocalStructures(RsFileTree::DirIndex dir_index,int depth)
-{
-    uint64_t total_size = 0;
-    uint64_t total_count = 0;
-    bool all_checked = true;
-    bool all_unchecked = false;
-
-    const auto& dd(mCollection.fileTree().directoryData(dir_index));
-
-    for(uint32_t i=0;i<dd.subdirs.size();++i)
-    {
-#ifdef DEBUG_COLLECTION_MODEL
-        for(int j=0;j<depth;++j) std::cerr << "  ";
-        std::cerr << "Dir \"" << mCollection.fileTree().directoryData(dd.subdirs[i]).name << "\"" << std::endl ;
-#endif
-
-        recursUpdateLocalStructures(dd.subdirs[i],depth+1);
-
-        auto& ref(mDirInfos[dd.subdirs[i]]);
-
-        total_size  += ref.total_size;
-        total_count += ref.total_count;
-
-        ref.parent_index = dir_index;
-        ref.parent_row   = i;
-
-        all_checked   = all_checked && (ref.check_state == SELECTED);
-        all_unchecked = all_unchecked && (ref.check_state == UNSELECTED);
-    }
-    for(uint32_t i=0;i<dd.subfiles.size();++i)
-    {
-#ifdef DEBUG_COLLECTION_MODEL
-        for(int j=0;j<depth;++j) std::cerr << "  ";
-        std::cerr << "File \"" << mCollection.fileTree().fileData(dd.subfiles[i]).name << "\"" << std::endl;
-#endif
-        auto& ref(mFileInfos[dd.subfiles[i]]);
-
-        if(ref.is_checked)
-        {
-            total_size += mCollection.fileTree().fileData(dd.subfiles[i]).size;
-            ++total_count;
-        }
-
-        ref.parent_index = dir_index;
-        ref.parent_row   = i + dd.subdirs.size();
-
-        all_checked = all_checked && ref.is_checked;
-        all_unchecked = all_unchecked && !ref.is_checked;
-    }
-
-    auto& r(mDirInfos[dir_index]);
-
-    r.total_size  = total_size;
-    r.total_count = total_count;
-
-    if(all_checked)
-        r.check_state = SELECTED;
-    else if(all_unchecked)
-        r.check_state = UNSELECTED;
-    else
-        r.check_state = PARTIALLY_SELECTED;
-}
-
-void RsCollectionModel::debugDump()
-{
-    std::function<void(RsFileTree::DirIndex,int)> recursDump = [&](RsFileTree::DirIndex indx,int depth) {
-        const auto& dir_data(mCollection.fileTree().directoryData(indx));
-
-        for(int i=0;i<depth;++i) std::cerr << "  ";
-        std::cerr << "Directory: \"" << dir_data.name << "\"  total_size: " << mDirInfos[indx].total_size << " cnt: " << mDirInfos[indx].total_count << std::endl;
-
-        for(uint32_t i=0;i<dir_data.subdirs.size();++i)
-            recursDump(dir_data.subdirs[i],depth+1);
-
-        for(uint32_t i=0;i<dir_data.subfiles.size();++i)
-        {
-            for(int i=0;i<depth+1;++i) std::cerr << "  ";
-            std::cerr << "File: \"" << mCollection.fileTree().fileData(dir_data.subfiles[i]).name << "\"" << std::endl;
-        }
-    };
-
-    std::cerr << "mCollectionModel data: " << std::endl;
-
-    recursDump(mCollection.fileTree().root(),0);
-
-    std::function<void(QModelIndex index,int)> recursDump2 = [&](QModelIndex indx,int depth) {
-
-        for(int i=0;i<depth;++i) std::cerr << "  ";
-
-        EntryIndex entry;
-        convertInternalIdToIndex(indx.internalId(),entry);
-
-        std::cerr << "Index: " << indx << " has_children: " << RsCollectionModel::hasChildren(indx)
-                  << ", rowCount: " << RsCollectionModel::rowCount(indx)
-                  << ", internalId: " << (uint64_t)indx.internalId()
-                  << ", type: " << (entry.is_file?"file":"dir") << " number " << entry.index
-                  << ", prow: " << (entry.is_file?mFileInfos[entry.index].parent_row:mDirInfos[entry.index].parent_row)
-                  << ", parent: " << RsCollectionModel::parent(indx)
-                  << ", display role: \"" << displayRole(entry,0).toString().toStdString()
-                  << std::endl;
-
-        for(int i=0;i<RsCollectionModel::rowCount(indx);++i)
-            recursDump2(RsCollectionModel::index(i,0,indx),depth+1);
-    };
-
-    std::cerr << "mCollectionModel index structure: " << std::endl;
-
-    recursDump2(QModelIndex(),0);
-
-    std::cerr << "mCollectionModel internal data: " << std::endl;
-    std::cerr << "Directories: "<< std::endl;
-    for(uint32_t i=0;i<mCollection.fileTree().numDirs();++i)
-        std::cerr << "  " << i << ": "<< mCollection.fileTree().directoryData(i).name << std::endl;
-    std::cerr << "Files: "<< std::endl;
-    for(uint32_t i=0;i<mCollection.fileTree().numFiles();++i)
-        std::cerr << "  " << i << ": " << mCollection.fileTree().fileData(i).name << std::endl;
-}
-
-
-
-
-
diff --git a/retroshare-gui/src/gui/common/RsCollectionModel.h b/retroshare-gui/src/gui/common/RsCollectionModel.h
deleted file mode 100644
index 705c3fc3b..000000000
--- a/retroshare-gui/src/gui/common/RsCollectionModel.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <QAbstractItemModel>
-
-#include "RsCollection.h"
-
-class RsCollectionModel: public QAbstractItemModel
-{
-    Q_OBJECT
-
-    public:
-        enum Roles{ FileNameRole = Qt::UserRole+1, SortRole = Qt::UserRole+2, FilterRole = Qt::UserRole+3 };
-
-        RsCollectionModel(const RsCollection& col, QObject *parent = 0);
-        virtual ~RsCollectionModel() = default;
-
-        /* Callback from Core */
-        void preMods();			// always call this before updating the RsCollection!
-        void postMods();		// always call this after updating the RsCollection!
-
-        /* Callback from GUI */
-
-        void update() ;
-        void filterItems(const std::list<std::string>& keywords, uint32_t& found) ;
-
-        // Overloaded from QAbstractItemModel
-        virtual QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex() ) const override;
-        virtual QModelIndex parent ( const QModelIndex & index ) const override;
-
-        virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-        virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-        virtual bool hasChildren(const QModelIndex & parent = QModelIndex()) const override;
-
-        virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
-        virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-        virtual bool setData(const QModelIndex& index,const QVariant& value,int role) override;
-        virtual Qt::ItemFlags flags ( const QModelIndex & index ) const override;
-#ifdef TODO
-        virtual QStringList mimeTypes () const override;
-        virtual QMimeData * mimeData ( const QModelIndexList & indexes ) const override;
-#if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
-        virtual Qt::DropActions supportedDragActions() const override;
-#endif
-#endif
-
-        struct EntryIndex {
-            bool is_file;		// false=dir, true=file
-            uint64_t index;
-        };
-        uint64_t totalSize() const { return mDirInfos[0].total_size; }
-        uint64_t totalSelected() const { return mDirInfos[0].total_count; }
-
-        void notifyFilesBeingHashed(const std::list<RsFileHash>& files);
-        void fileHashingFinished(const RsFileHash& hash);
-        bool isChecked(EntryIndex);
-
-        EntryIndex getIndex(const QModelIndex& i) const;
-    signals:
-        void sizesChanged();	// tells that the total size of the top level dir has changed (due to selection)
-
-    private:
-        static bool convertIndexToInternalId(const EntryIndex& e,quintptr& ref);
-        static bool convertInternalIdToIndex(quintptr ref, EntryIndex& e);
-
-        void recursUpdateLocalStructures(RsFileTree::DirIndex dir_index, int depth);
-
-        QVariant displayRole(const EntryIndex&,int col) const ;
-        QVariant sortRole(const EntryIndex&,int col) const ;
-        QVariant decorationRole(const EntryIndex&,int col) const ;
-        QVariant checkStateRole(const EntryIndex& i,int col) const;
-        QVariant textColorRole(const EntryIndex& i,int col) const;
-        //QVariant filterRole(const DirDetails& details,int coln) const;
-
-        void debugDump();
-
-        bool mUpdating ;
-
-        const RsCollection& mCollection;
-
-        enum DirCheckState: uint8_t {
-            UNSELECTED            = 0x00,
-            PARTIALLY_SELECTED    = 0x01,
-            SELECTED              = 0x02,
-        };
-
-        struct ModelDirInfo {
-             ModelDirInfo() :parent_index(0),parent_row(0),check_state(SELECTED),total_size(0),total_count(0){}
-
-             RsFileTree::DirIndex parent_index;	// index of the parent
-             RsFileTree::DirIndex parent_row; // row of that child, in this parent
-             DirCheckState check_state;
-             uint64_t total_size;
-             uint64_t total_count;
-        };
-
-        struct ModelFileInfo {
-                ModelFileInfo() :parent_index(0),parent_row(0),is_checked(true){}
-
-             RsFileTree::DirIndex parent_index;	// index of the parent
-             RsFileTree::DirIndex parent_row; // row of that child, in this parent
-            bool is_checked;
-        };
-
-        std::vector<ModelFileInfo> mFileInfos;
-        std::vector<ModelDirInfo> mDirInfos;
-
-        std::set<RsFileHash> mFilesBeingHashed;
-
-        // std::set<void*> mFilteredPointers ;
-};
diff --git a/retroshare-gui/src/gui/common/RsUrlHandler.cpp b/retroshare-gui/src/gui/common/RsUrlHandler.cpp
index 94ec79753..6ac6310ac 100644
--- a/retroshare-gui/src/gui/common/RsUrlHandler.cpp
+++ b/retroshare-gui/src/gui/common/RsUrlHandler.cpp
@@ -21,13 +21,19 @@
 #include <stdexcept>
 #include <QDesktopServices>
 #include <QUrl>
-#include "RsCollectionDialog.h"
+#include "RsCollection.h"
 #include "RsUrlHandler.h"
 
 bool RsUrlHandler::openUrl(const QUrl& url)
 {
 	if(url.scheme() == QString("file") && url.toLocalFile().endsWith("."+RsCollection::ExtensionString))
-        return RsCollectionDialog::openExistingCollection(url.toLocalFile());
-
+	{
+		RsCollection collection ;
+		if(collection.load(url.toLocalFile()))
+		{
+			collection.downloadFiles() ;
+			return true;
+		}
+	}
 	return QDesktopServices::openUrl(url) ;
 }
diff --git a/retroshare-gui/src/gui/elastic/arrow.cpp b/retroshare-gui/src/gui/elastic/arrow.cpp
index 5698a3da6..6a95f2041 100644
--- a/retroshare-gui/src/gui/elastic/arrow.cpp
+++ b/retroshare-gui/src/gui/elastic/arrow.cpp
@@ -33,7 +33,7 @@ static double TwoPi = 2.0 * Pi;
 Arrow::Arrow(Node *sourceNode, Node *destNode)
     : arrowSize(10)
 {
-    setAcceptedMouseButtons(Qt::MouseButton::NoButton);
+    setAcceptedMouseButtons(0);
     source = sourceNode;
     dest = destNode;
 #ifdef SUSP
diff --git a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
index db4ac6b1a..cd0265c1d 100644
--- a/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChannelsCommentsItem.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>836</width>
-    <height>160</height>
+    <width>755</width>
+    <height>157</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="ChannelsCommentsItem_GL">
@@ -35,10 +35,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <property name="topMargin">
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
index 43537d061..e17f53c48 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>189</height>
+    <height>176</height>
    </rect>
   </property>
   <property name="font">
@@ -134,10 +134,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <item row="0" column="0">
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
index d4d41dc06..578fa1637 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1092</width>
-    <height>255</height>
+    <height>231</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="GxsChannelPostItem_GL">
@@ -41,10 +41,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QVBoxLayout" name="feedFrame_VL">
       <item>
diff --git a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
index 374e8f84d..7a77f5bda 100644
--- a/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsCircleItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>128</height>
+    <height>108</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="GxsCircleItem_GL">
@@ -126,10 +126,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QHBoxLayout" name="feedFrame_HL">
       <item>
@@ -317,7 +317,7 @@
              <string>Revoke</string>
             </property>
             <property name="icon">
-             <iconset>
+             <iconset resource="../images.qrc">
               <normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
             </property>
            </widget>
diff --git a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
index aee325282..152d4951d 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsForumGroupItem.ui
@@ -126,10 +126,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QVBoxLayout" name="feedFrame_VL">
       <item>
diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
index 4a080effb..89aec4e1b 100644
--- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.ui
@@ -99,10 +99,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <item row="0" column="0" rowspan="2">
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui
index cf0a3ac08..b195e80c6 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/MsgItem.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>777</width>
-    <height>234</height>
+    <width>707</width>
+    <height>180</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="MsgItem_GL">
@@ -35,10 +35,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <item row="0" column="0">
diff --git a/retroshare-gui/src/gui/feeds/PeerItem.ui b/retroshare-gui/src/gui/feeds/PeerItem.ui
index 2433cdf09..603002f7f 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.ui
+++ b/retroshare-gui/src/gui/feeds/PeerItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>476</width>
-    <height>328</height>
+    <height>283</height>
    </rect>
   </property>
   <property name="autoFillBackground">
@@ -38,10 +38,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_gL">
       <property name="verticalSpacing">
diff --git a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
index 6c043972f..b525facb9 100644
--- a/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
+++ b/retroshare-gui/src/gui/feeds/PostedGroupItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>618</width>
-    <height>195</height>
+    <height>161</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="PostedGroupItem_GL">
@@ -126,10 +126,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <item row="0" column="0">
diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
index 53f4172b9..11a742880 100644
--- a/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>763</width>
-    <height>205</height>
+    <height>185</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="SecurityIpItem_GL">
@@ -38,10 +38,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <property name="verticalSpacing">
diff --git a/retroshare-gui/src/gui/feeds/SecurityItem.ui b/retroshare-gui/src/gui/feeds/SecurityItem.ui
index 585c18e00..bc0524d18 100644
--- a/retroshare-gui/src/gui/feeds/SecurityItem.ui
+++ b/retroshare-gui/src/gui/feeds/SecurityItem.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1015</width>
-    <height>326</height>
+    <height>246</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="SecurityItem_GL">
@@ -35,10 +35,10 @@
       <bool>true</bool>
      </property>
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="feedFrame_GL">
       <property name="verticalSpacing">
diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.ui b/retroshare-gui/src/gui/feeds/SubFileItem.ui
index d869fc7b8..8fdd8230d 100644
--- a/retroshare-gui/src/gui/feeds/SubFileItem.ui
+++ b/retroshare-gui/src/gui/feeds/SubFileItem.ui
@@ -29,10 +29,10 @@
    <item row="0" column="0">
     <widget class="QFrame" name="gradFrame">
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="gradFrame_GL">
       <item row="1" column="0">
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
index afc676bdd..1233b3100 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentDialog.cpp
@@ -131,19 +131,15 @@ void GxsCommentDialog::idChooserReady()
 
 void GxsCommentDialog::voterSelectionChanged( int index )
 {
-#ifdef DEBUG_COMMENT_DIALOG
 	std::cerr << "GxsCommentDialog::voterSelectionChanged(" << index << ")";
 	std::cerr << std::endl;
-#endif
 
 	RsGxsId voterId; 
 	switch (ui->idChooser->getChosenId(voterId)) {
 		case GxsIdChooser::KnowId:
 		case GxsIdChooser::UnKnowId:
-#ifdef DEBUG_COMMENT_DIALOG
-        std::cerr << "GxsCommentDialog::voterSelectionChanged() => " << voterId;
+		std::cerr << "GxsCommentDialog::voterSelectionChanged() => " << voterId;
 		std::cerr << std::endl;
-#endif
 		ui->treeWidget->setVoteId(voterId);
 
 		break;
@@ -164,10 +160,8 @@ void GxsCommentDialog::setCommentHeader(QWidget *header)
 		return;
 	}
 
-#ifdef DEBUG_COMMENT_DIALOG
-    std::cerr << "GxsCommentDialog::setCommentHeader() Adding header to ui,postFrame";
+	std::cerr << "GxsCommentDialog::setCommentHeader() Adding header to ui,postFrame";
 	std::cerr << std::endl;
-#endif
 
 	//header->setParent(ui->postFrame);
 	//ui->postFrame->setVisible(true);
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
index 277b11e4f..bd230fe9c 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
@@ -21,8 +21,6 @@
 #include "GxsCommentTreeWidget.h"
 
 #include "gui/common/FilesDefs.h"
-#include "gui/Identity/IdDialog.h"
-#include "gui/MainWindow.h"
 #include "gui/common/RSElidedItemDelegate.h"
 #include "gui/common/RSTreeWidgetItem.h"
 #include "gui/gxs/GxsCreateCommentDialog.h"
@@ -348,10 +346,6 @@ void GxsCommentTreeWidget::customPopUpMenu(const QPoint& point)
 	action = contextMnu.addAction(FilesDefs::getIconFromQtResourcePath(IMAGE_VOTEDOWN), tr("Vote Down"), this, SLOT(voteDown()));
 	action->setDisabled(!item || mCurrentCommentMsgId.isNull() || mVoterId.isNull());
 
-	contextMnu.addSeparator();
-
-	action = contextMnu.addAction(tr("Show Author"), this, SLOT(showAuthor()));
-	action->setDisabled(!item || mCurrentCommentMsgId.isNull() || mVoterId.isNull());
 
 	if (!mCurrentCommentMsgId.isNull())
 	{
@@ -470,19 +464,6 @@ void GxsCommentTreeWidget::replyToComment()
 	pcc.exec();
 }
 
-
-void GxsCommentTreeWidget::showAuthor()
-{
-	/* window will destroy itself! */
-	IdDialog *idDialog = dynamic_cast<IdDialog*>(MainWindow::getPage(MainWindow::People));
-
-	if (!idDialog)
-		return ;
-
-	MainWindow::showWindow(MainWindow::People);
-	idDialog->navigate(RsGxsId(mCurrentCommentAuthorId));
-}
-
 void GxsCommentTreeWidget::copyComment()
 {
     QString txt = dynamic_cast<QAction*>(sender())->data().toString();
diff --git a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
index 5f52459a9..43a6f55a5 100644
--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.h
@@ -72,7 +72,6 @@ public slots:
 
     void makeComment();
     void replyToComment();
-    void showAuthor();
 
     void copyComment();
 
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
index 069c51b79..9d8d66d61 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
@@ -466,9 +466,7 @@ void GxsGroupFrameDialog::groupTreeCustomPopupMenu(QPoint point)
 			uint32_t current_store_time = checkDelay(mInterface->getStoragePeriod(mGroupId))/86400 ;
 			uint32_t current_sync_time  = checkDelay(mInterface->getSyncPeriod(mGroupId))/86400 ;
 
-#ifdef DEBUG_GROUPFRAMEDIALOG
 			std::cerr << "Got sync=" << current_sync_time << ". store=" << current_store_time << std::endl;
-#endif
 			QAction *actnn = NULL;
 
 			QMenu *ctxMenu2 = contextMnu.addMenu(tr("Synchronise posts of last...")) ;
diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
index 5c1c11b49..b1961a6e6 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
@@ -85,27 +85,23 @@ void ReputationItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 {
 	Q_ASSERT(index.isValid());
 
-    QStyleOptionViewItem opt(option);
+	QStyleOptionViewItemV4 opt = option;
 	initStyleOption(&opt, index);
 	// disable default icon
 	opt.icon = QIcon();
 	// draw default item
 	QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &opt, painter, 0);
 
-    const QRect r = option.rect;
+	const QRect r = option.rect;
 
 	// get pixmap
-    auto v = index.data(Qt::DecorationRole);
-
-    if(!v.canConvert(QVariant::Int))
-        return;
-
-    unsigned int icon_index = qvariant_cast<unsigned int>(v);
+	unsigned int icon_index = qvariant_cast<unsigned int>(index.data(Qt::DecorationRole));
 
 	if(icon_index > mMaxLevelToDisplay)
 		return ;
 
-    QIcon icon = GxsIdDetails::getReputationIcon( RsReputationLevel(icon_index), 0xff );
+	QIcon icon = GxsIdDetails::getReputationIcon(
+	            RsReputationLevel(icon_index), 0xff );
 
 	QPixmap pix = icon.pixmap(r.size());
 
@@ -114,12 +110,6 @@ void ReputationItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 	painter->drawPixmap(r.topLeft() + p, pix);
 }
 
-QSize ReputationItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex & /*index*/) const
-{
-    int s = 1.5*QFontMetricsF(option.font).height();
-
-    return QSize(s,s);
-}
 /* The global object */
 GxsIdDetails *GxsIdDetails::mInstance = NULL ;
 
diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.h b/retroshare-gui/src/gui/gxs/GxsIdDetails.h
index 122b5e089..05568aa3a 100644
--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.h
+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.h
@@ -52,8 +52,7 @@ public:
 	ReputationItemDelegate(RsReputationLevel max_level_to_display) :
 	    mMaxLevelToDisplay(static_cast<uint32_t>(max_level_to_display)) {}
 
-    virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
-    virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex & /*index*/) const override;
+    virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
 private:
     uint32_t mMaxLevelToDisplay ;
diff --git a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
index 8a42911ac..1f55f514f 100644
--- a/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsMessageFrameWidget.cpp
@@ -35,7 +35,7 @@ GxsMessageFrameWidget::GxsMessageFrameWidget(RsGxsIfaceHelper *ifaceImpl, QWidge
 	mAcknowledgeReadStatusToken = 0;
 
 	/* Add dummy entry to store waiting status */
-	mStateHelper->addWidget(mTokenTypeAcknowledgeReadStatus, NULL, UIStates());
+	mStateHelper->addWidget(mTokenTypeAcknowledgeReadStatus, NULL, 0);
 }
 
 GxsMessageFrameWidget::~GxsMessageFrameWidget()
diff --git a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
index 01e58118f..510da23a1 100644
--- a/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
+++ b/retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
@@ -191,8 +191,8 @@
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;&quot;&gt;Attachments:&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:''; font-size:;&quot;&gt; Use Drag and Drop / Add Files button, to Hash new files.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:''; font-size:;&quot;&gt; Copy/Paste RetroShare links from your shares&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt; Use Drag and Drop / Add Files button, to Hash new files.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt; Copy/Paste RetroShare links from your shares&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -515,8 +515,8 @@ p, li { white-space: pre-wrap; }
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>98</width>
-               <height>30</height>
+               <width>63</width>
+               <height>24</height>
               </rect>
              </property>
              <property name="sizePolicy">
@@ -611,11 +611,6 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RSComboBox</class>
-   <extends>QComboBox</extends>
-   <header>gui/common/RSComboBox.h</header>
-  </customwidget>
   <customwidget>
    <class>ChannelPostThumbnailView</class>
    <extends>QWidget</extends>
@@ -634,10 +629,15 @@ p, li { white-space: pre-wrap; }
    <header>util/RichTextEdit.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>RSComboBox</class>
+   <extends>QComboBox</extends>
+   <header>gui/common/RSComboBox.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
index 806fcaa69..0796b6ce1 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp
@@ -499,9 +499,8 @@ void RsGxsChannelPostFilesModel::update_files(std::set<ChannelPostFileInfo>& add
         else
             ++afit;
     }
-#ifdef DEBUG_CHANNEL_FILES_MODEL
+
     RsDbg() << "  Remains: " << added_files.size() << " added files and " << removed_files.size() << " removed files" ;
-#endif
 
     // 2 - add whatever file remains,
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
index 560c37577..16cf96195 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.cpp
@@ -309,24 +309,6 @@ void ZoomableLabel::wheelEvent(QWheelEvent *me)
     updateView();
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
-void ZoomableLabel::enterEvent(QEnterEvent* /*event*/)
-#else
-void ZoomableLabel::enterEvent(QEvent* /*event*/)
-#endif
-{
-    if (mUseStyleSheet) {
-        setStyleSheet("QLabel { border: 2px solid #039bd5; }");
-    }
-}
-
-void ZoomableLabel::ZoomableLabel::leaveEvent(QEvent* /*event*/)
-{
-    if (mUseStyleSheet) {
-        setStyleSheet("QLabel { border: 2px solid #CCCCCC; border-radius: 3px; }");
-    }
-}
-
 QPixmap ZoomableLabel::extractCroppedScaledPicture() const
 {
     QRect rect(mCenterX - 0.5 * width()*mZoomFactor, mCenterY - 0.5 * height()*mZoomFactor, width()*mZoomFactor, height()*mZoomFactor);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h
index da30f2083..7ee928f9e 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostThumbnail.h
@@ -64,12 +64,8 @@ protected:
     void resizeEvent(QResizeEvent *ev) override;
     void wheelEvent(QWheelEvent *me) override;
 
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
-    void enterEvent(QEnterEvent *event) override;
-#else
-    void enterEvent(QEvent *event) override;
-#endif
-    void leaveEvent(QEvent *event) override;
+    void enterEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #039bd5; }");}
+    void leaveEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #CCCCCC; border-radius: 3px; }");}
 
     bool mUseStyleSheet;
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index 8b5b7e707..a42587d85 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -38,7 +38,7 @@
 #include "GxsChannelPostFilesModel.h"
 
 //#define DEBUG_CHANNEL_MODEL_DATA
-//#define DEBUG_CHANNEL_MODEL
+#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 Q_DECLARE_METATYPE(RsGxsChannelPost)
@@ -592,12 +592,10 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
 			std::cerr << __PRETTY_FUNCTION__ << " failed to retrieve channel messages for channel " << group_id << std::endl;
 			return;
 		}
-#ifdef DEBUG_CHANNEL_MODEL
         std::cerr << "Got channel all content for channel " << group_id << std::endl;
         std::cerr << "  posts   : " << posts->size() << std::endl;
         std::cerr << "  comments: " << comments.size() << std::endl;
         std::cerr << "  votes   : " << votes.size() << std::endl;
-#endif
 
         // 2 - update the model in the UI thread.
 
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index c041e4369..2e292444e 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -41,7 +41,6 @@
 #include "util/DateTime.h"
 #include "util/qtthreadsutils.h"
 #include "gui/common/FilesDefs.h"
-#include "util/QtVersion.h"
 
 #include "GxsChannelPostsWidgetWithModel.h"
 #include "GxsChannelPostsModel.h"
@@ -782,9 +781,7 @@ void GxsChannelPostsWidgetWithModel::handlePostsTreeSizeChange(QSize s,bool forc
         return;
 
     int n_columns = std::max(1,(int)floor(s.width() / (mChannelPostsDelegate->cellSize(0,font(),ui->postsTree->width()))));
-#ifdef DEBUG_CHANNEL_POSTS_WIDGET
     RsDbg() << "nb columns: " << n_columns << " current count=" << mChannelPostsModel->columnCount() ;
-#endif
 
     // save current post. The setNumColumns() indeed loses selection
 
@@ -828,9 +825,7 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
         {
             if(e->mChannelGroupId == groupId())
             {
-#ifdef DEBUG_CHANNEL_POSTS_WIDGET
                 RsDbg() << "Received new message in current channel, msgId=" << e->mChannelMsgId ;
-#endif
 
                 RsThread::async([this,E=*e]()	// dereferencing to make a copy that will survive while e is deleted by the parent thread.
                 {
@@ -1047,9 +1042,7 @@ void GxsChannelPostsWidgetWithModel::updateData(bool update_group_data, bool upd
 
 void GxsChannelPostsWidgetWithModel::postChannelPostLoad()
 {
-#ifdef DEBUG_CHANNEL_POSTS_WIDGET
     std::cerr << "Post channel load..." << std::endl;
-#endif
 
     if (!mNavigatePendingMsgId.isNull())
         navigate(mNavigatePendingMsgId);
@@ -1455,7 +1448,7 @@ void GxsChannelPostsWidgetWithModel::switchOnlyUnread(bool)
 }
 void GxsChannelPostsWidgetWithModel::filterChanged(QString s)
 {
-    QStringList ql = s.split(' ',QtSkipEmptyParts);
+    QStringList ql = s.split(' ',QString::SkipEmptyParts);
     uint32_t count;
     mChannelPostsModel->setFilter(ql,ui->showUnread_TB->isChecked(),count);
     mChannelFilesModel->setFilter(ql,count);
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
index 2740b4654..6bd0fb86b 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@@ -29,10 +29,10 @@
    <item>
     <widget class="QFrame" name="toolBarFrame">
      <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::Box</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <property name="leftMargin">
@@ -402,7 +402,7 @@
           <string notr="true">&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:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; 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-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textInteractionFlags">
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
index 3224b428f..4236b6f04 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.cpp
@@ -449,7 +449,7 @@ void  CreateGxsForumMsg::createMsg()
 		default:
 			std::cerr << "CreateGxsForumMsg::createMsg() ERROR GETTING AuthorId!";
 			std::cerr << std::endl;
-			QMessageBox::warning(this, tr("RetroShare"),tr("Congrats, you found a bug!")+" "+QString(__FILE__)+":"+QString::number(__LINE__), QMessageBox::Ok, QMessageBox::Ok);
+			QMessageBox::warning(this, tr("RetroShare"),tr("Congrats, you found a bug!")+" "+QString(__FILE__)+":"+QString(__LINE__), QMessageBox::Ok, QMessageBox::Ok);
 
 			return;
 		}//switch (ui->idChooser->getChosenId(authorId))
diff --git a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
index bae7223e3..10105a630 100644
--- a/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
+++ b/retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>640</width>
-    <height>551</height>
+    <height>465</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -34,14 +34,7 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="HeaderFrame" name="headerFrame">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-    </widget>
+    <widget class="HeaderFrame" name="headerFrame"/>
    </item>
    <item>
     <widget class="QFrame" name="gradFrame">
@@ -139,12 +132,17 @@
             </item>
             <item row="3" column="0">
              <widget class="MimeTextEdit" name="forumMessage">
+              <property name="font">
+               <font>
+                <family>MS Sans Serif</family>
+               </font>
+              </property>
               <property name="html">
                <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;
 &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:''; font-size:; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
              </widget>
             </item>
@@ -157,10 +155,10 @@ p, li { white-space: pre-wrap; }
                </size>
               </property>
               <property name="frameShape">
-               <enum>QFrame::StyledPanel</enum>
+               <enum>QFrame::Box</enum>
               </property>
               <property name="frameShadow">
-               <enum>QFrame::Raised</enum>
+               <enum>QFrame::Sunken</enum>
               </property>
               <layout class="QHBoxLayout" name="toolBarFrame_HL">
                <property name="spacing">
@@ -384,11 +382,6 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>MimeTextEdit</class>
-   <extends>QTextEdit</extends>
-   <header location="global">gui/common/MimeTextEdit.h</header>
-  </customwidget>
   <customwidget>
    <class>GxsIdChooser</class>
    <extends>QComboBox</extends>
@@ -406,10 +399,15 @@ p, li { white-space: pre-wrap; }
    <header location="global">gui/common/HashBox.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>MimeTextEdit</class>
+   <extends>QTextEdit</extends>
+   <header location="global">gui/common/MimeTextEdit.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
index 18f518749..b68a50173 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
@@ -46,7 +46,6 @@ RsGxsForumModel::RsGxsForumModel(QObject *parent)
     : QAbstractItemModel(parent), mUseChildTS(false),mFilteringEnabled(false),mTreeMode(TREE_MODE_TREE)
 {
     initEmptyHierarchy(mPosts);
-    mFont = QApplication::font();
 }
 
 void RsGxsForumModel::preMods()
@@ -400,7 +399,7 @@ QVariant RsGxsForumModel::data(const QModelIndex &index, int role) const
 
     if(role == Qt::FontRole)
     {
-        QFont font = mFont;
+        QFont font ;
         font.setBold( (fmpe.mPostFlags & ForumModelPostEntry::FLAG_POST_HAS_UNREAD_CHILDREN) || IS_MSG_UNREAD(fmpe.mMsgStatus));
         return QVariant(font);
     }
@@ -534,15 +533,6 @@ void RsGxsForumModel::setFilter(int column,const QStringList& strings,uint32_t&
 	postMods();
 }
 
-void RsGxsForumModel::setFont(const QFont &font)
-{
-    preMods();
-
-    mFont = font;
-
-    postMods();
-}
-
 QVariant RsGxsForumModel::missingRole(const ForumModelPostEntry& fmpe,int /*column*/) const
 {
     if(fmpe.mPostFlags & ForumModelPostEntry::FLAG_POST_IS_MISSING)
@@ -572,7 +562,7 @@ QVariant RsGxsForumModel::toolTipRole(const ForumModelPostEntry& fmpe,int column
 		if(!GxsIdDetails::MakeIdDesc(fmpe.mAuthorId, true, str, icons, comment,GxsIdDetails::ICON_TYPE_AVATAR))
 			return QVariant();
 
-		int S = QFontMetricsF(mFont).height();
+		int S = QFontMetricsF(QApplication::font()).height();
 		QImage pix( (*icons.begin()).pixmap(QSize(5*S,5*S)).toImage());
 
 		QString embeddedImage;
@@ -609,7 +599,7 @@ QVariant RsGxsForumModel::backgroundRole(const ForumModelPostEntry& fmpe,int /*c
 
 QVariant RsGxsForumModel::sizeHintRole(int col) const
 {
-	float factor = QFontMetricsF(mFont).height()/14.0f ;
+	float factor = QFontMetricsF(QApplication::font()).height()/14.0f ;
 
 	switch(col)
 	{
@@ -660,7 +650,7 @@ QVariant RsGxsForumModel::displayRole(const ForumModelPostEntry& fmpe,int col) c
 		case COLUMN_THREAD_TITLE:  if(fmpe.mPostFlags & ForumModelPostEntry::FLAG_POST_IS_REDACTED)
 									return QVariant(tr("[ ... Redacted message ... ]"));
 //                                else if(fmpe.mPostFlags & ForumModelPostEntry::FLAG_POST_IS_PINNED)
-//                                    return QVariant( QString("<img src=\":/icons/pinned_64.png\" height=%1/>").arg(QFontMetricsF(mFont).height())
+//                                    return QVariant( QString("<img src=\":/icons/pinned_64.png\" height=%1/>").arg(QFontMetricsF(QFont()).height())
 //                                                     + QString::fromUtf8(fmpe.mTitle.c_str()));
                                 else
 									return QVariant(QString::fromUtf8(fmpe.mTitle.c_str()));
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
index 10248101f..c69013c3e 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumModel.h
@@ -22,7 +22,6 @@
 #include "retroshare/rsgxsifacetypes.h"
 #include <QModelIndex>
 #include <QColor>
-#include <QFont>
 
 struct ForumModelPostEntry: public ForumPostEntry
 {
@@ -77,7 +76,6 @@ public:
 	QModelIndex getIndexOfMessage(const RsGxsMessageId& mid) const;
 
     static const QString FilterString ;
-    void setFont(const QFont &font);
 
 	std::vector<std::pair<rstime_t,RsGxsMessageId> > getPostVersions(const RsGxsMessageId& mid) const;
 
@@ -187,7 +185,6 @@ private:
 
 	QColor mBackgroundColorPinned;
 	QColor mBackgroundColorFiltered;
-	QFont mFont;
 
     friend class const_iterator;
 };
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
index 6c87e8a04..11d04fdd8 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
@@ -321,6 +321,10 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
 
     float f = QFontMetricsF(font()).height()/14.0f ;
 
+    QFontMetricsF fontMetrics(ui->threadTreeWidget->font());
+    int iconHeight = fontMetrics.height() * 1.4;
+    ui->threadTreeWidget->setIconSize(QSize(iconHeight, iconHeight));
+
     /* Set header resize modes and initial section sizes */
 
     QHeaderView * ttheader = ui->threadTreeWidget->header () ;
@@ -376,10 +380,6 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
                 [this](std::shared_ptr<const RsEvent> event)
     { RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this ); },
                 mEventHandlerId, RsEventType::GXS_FORUMS );
-
-    mFontSizeHandler.registerFontSize(ui->threadTreeWidget, 1.4f, [this](QAbstractItemView *view, int) {
-        mThreadModel->setFont(view->font());
-    });
 }
 
 void GxsForumThreadWidget::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
@@ -1846,7 +1846,7 @@ void GxsForumThreadWidget::filterColumnChanged(int column)
 
 void GxsForumThreadWidget::filterItems(const QString& text)
 {
-    QStringList lst = text.split(" ",QtSkipEmptyParts) ;
+    QStringList lst = text.split(" ",QString::SkipEmptyParts) ;
 
     int filterColumn = ui->filterLineEdit->currentFilter();
 
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
index 8e6b1c01b..322c64fae 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
@@ -26,7 +26,6 @@
 #include "gui/gxs/GxsMessageFrameWidget.h"
 #include <retroshare/rsgxsforums.h>
 #include "gui/gxs/GxsIdDetails.h"
-#include "util/FontSizeHandler.h"
 
 class QSortFilterProxyModel;
 class QTreeWidgetItem;
@@ -235,8 +234,6 @@ private:
     QSortFilterProxyModel *mThreadProxyModel;
     QList<RsGxsMessageId> mSavedExpandedMessages;
 
-    FontSizeHandler mFontSizeHandler;
-
     Ui::GxsForumThreadWidget *ui;
     RsEventsHandlerId_t mEventHandlerId;
 };
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
index 439234047..5a9c51e93 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui
@@ -48,10 +48,10 @@
           </size>
          </property>
          <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
+          <enum>QFrame::Box</enum>
          </property>
          <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Sunken</enum>
          </property>
          <layout class="QHBoxLayout" name="toolBarFrameHLayout">
           <property name="leftMargin">
@@ -578,9 +578,10 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>LineEditClear</class>
-   <extends>QLineEdit</extends>
-   <header location="global">gui/common/LineEditClear.h</header>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/common/ElidedLabel.h</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
    <class>GxsIdLabel</class>
@@ -588,15 +589,9 @@
    <header>gui/gxs/GxsIdLabel.h</header>
   </customwidget>
   <customwidget>
-   <class>ElidedLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/common/ElidedLabel.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>SubscribeToolButton</class>
-   <extends>QToolButton</extends>
-   <header>gui/common/SubscribeToolButton.h</header>
+   <class>LineEditClear</class>
+   <extends>QLineEdit</extends>
+   <header>gui/common/LineEditClear.h</header>
   </customwidget>
   <customwidget>
    <class>RSImageBlockWidget</class>
@@ -614,6 +609,11 @@
    <extends>QComboBox</extends>
    <header>gui/common/RSComboBox.h</header>
   </customwidget>
+  <customwidget>
+   <class>SubscribeToolButton</class>
+   <extends>QToolButton</extends>
+   <header>gui/common/SubscribeToolButton.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
diff --git a/retroshare-gui/src/gui/help/browser/helpbrowser.cpp b/retroshare-gui/src/gui/help/browser/helpbrowser.cpp
index 0da10e9d9..b21ba2cc5 100644
--- a/retroshare-gui/src/gui/help/browser/helpbrowser.cpp
+++ b/retroshare-gui/src/gui/help/browser/helpbrowser.cpp
@@ -117,7 +117,7 @@ HelpBrowser::~HelpBrowser()
 QString
 HelpBrowser::language()
 {
-  QString lang = RsApplication::language();
+  QString lang = Rshare::language();
   if (!QDir(":/help/" + lang).exists())
     lang = "en";
   return lang;
@@ -348,7 +348,7 @@ HelpBrowser::find(bool forward)
     return;
   }
   
-  QTextDocument::FindFlags flags = QTextDocument::FindFlags();
+  QTextDocument::FindFlags flags = 0;
   QTextCursor cursor = ui.txtBrowser->textCursor();
   QString searchPhrase = ui.lineFind->text();
   
diff --git a/retroshare-gui/src/gui/help/browser/helptextbrowser.cpp b/retroshare-gui/src/gui/help/browser/helptextbrowser.cpp
index d9b012775..a4b70058f 100644
--- a/retroshare-gui/src/gui/help/browser/helptextbrowser.cpp
+++ b/retroshare-gui/src/gui/help/browser/helptextbrowser.cpp
@@ -54,7 +54,7 @@ HelpTextBrowser::loadResource(int type, const QUrl &name)
     /* Fall back to English if there is no translation of the specified help
      * page in the current language. */
     if (!name.path().contains("/")) {
-      QString language = RsApplication::language();
+      QString language = Rshare::language();
       if (!QDir(":/help/" + language).exists())
         language = "en";
       helpPath += language + "/";
diff --git a/retroshare-gui/src/gui/icons/invite64.png b/retroshare-gui/src/gui/icons/invite64.png
index f07e0fb4f..8ab342a7b 100644
Binary files a/retroshare-gui/src/gui/icons/invite64.png and b/retroshare-gui/src/gui/icons/invite64.png differ
diff --git a/retroshare-gui/src/gui/icons/png/invite.png b/retroshare-gui/src/gui/icons/png/invite.png
index 7f0baf91b..5fda4753e 100644
Binary files a/retroshare-gui/src/gui/icons/png/invite.png and b/retroshare-gui/src/gui/icons/png/invite.png differ
diff --git a/retroshare-gui/src/gui/icons/svg/invite.svg b/retroshare-gui/src/gui/icons/svg/invite.svg
index 8a25949a8..afcefbd72 100644
--- a/retroshare-gui/src/gui/icons/svg/invite.svg
+++ b/retroshare-gui/src/gui/icons/svg/invite.svg
@@ -2,28 +2,25 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   id="svg4155"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4823"
    version="1.1"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   inkscape:version="0.91 r13725"
    xml:space="preserve"
    width="80"
    height="80"
    viewBox="0 0 80 80"
-   sodipodi:docname="invite.svg"
-   inkscape:export-filename="C:\Users\ProBook\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\invite.png"
-   inkscape:export-xdpi="153.60001"
-   inkscape:export-ydpi="153.60001"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
-     id="metadata4161"><rdf:RDF><cc:Work
+   sodipodi:docname="invite.svg"><metadata
+     id="metadata4829"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs4159" /><sodipodi:namedview
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs4827" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
@@ -32,31 +29,46 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="705"
-     id="namedview4157"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview4825"
      showgrid="false"
-     inkscape:zoom="2.559375"
-     inkscape:cx="34.188034"
-     inkscape:cy="69.352868"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="1.475"
+     inkscape:cx="-155.33838"
+     inkscape:cy="28.585876"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:pagecheckerboard="0" /><g
-     id="g4163"
+     inkscape:current-layer="g4831" /><g
+     id="g4831"
      inkscape:groupmode="layer"
      inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.25,0,0,-1.25,0,80)"
-     style="display:inline"><path
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
        inkscape:connector-curvature="0"
-       id="path4167"
+       id="path4835"
        style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /></g><g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="forground"
-     style="display:inline"><path
-       style="fill:#f9f9f9;stroke-width:0.115097"
-       d="m 16.369227,64.730725 c -2.410081,-0.519492 -4.393567,-2.486625 -4.89547,-4.855106 -0.230292,-1.086748 -0.232509,-8.437472 -0.0031,-10.160706 0.544804,-4.091726 2.311934,-7.6619 5.240845,-10.588196 0.729631,-0.728977 1.620855,-1.524992 1.9805,-1.768921 l 0.653899,-0.443506 0.870488,0.635708 c 1.713047,1.251025 4.034249,2.2608 6.317223,2.748136 1.666706,0.355784 4.587773,0.356708 6.248914,0.0019 2.717698,-0.580353 4.507782,-1.407765 7.126351,-3.293936 0.472315,-0.340212 5.163656,4.356013 4.822871,4.827896 -1.873071,2.593626 -2.716501,4.411741 -3.283366,7.077697 -0.3636,1.710005 -0.366662,4.607965 -0.0066,6.294485 0.619445,2.901855 2.005028,5.663034 3.887193,7.746366 0.407391,0.450932 0.415297,0.475502 0.20546,0.638472 -0.545416,0.423596 -2.110246,1.093106 -2.807926,1.201366 -0.471223,0.07313 -5.349087,0.113024 -13.178634,0.107808 -10.202918,-0.0067 -12.564565,-0.03718 -13.178629,-0.169543 z m 39.420806,0.0498 c -4.989364,-0.623224 -9.270985,-4.31662 -10.693102,-9.224051 -1.670749,-5.765402 1.045758,-12.068253 6.384936,-14.81436 2.550296,-1.311698 5.092938,-1.744661 7.818632,-1.331366 2.790409,0.423106 5.148972,1.616342 7.149858,3.617227 6.209256,6.209257 4.488252,16.634919 -3.383501,20.496904 -2.348935,1.152418 -4.765258,1.569365 -7.276823,1.255646 z M 58.3181,57.212066 c 0.613555,-0.348996 0.802549,-0.844473 0.85019,-2.228919 l 0.04257,-1.237296 1.224561,-4.6e-4 c 1.026113,-3.45e-4 1.286453,-0.03817 1.60646,-0.233264 0.506112,-0.308566 0.877263,-1.129212 0.76979,-1.702082 -0.199788,-1.064967 -0.953807,-1.510795 -2.561627,-1.514613 l -1.064649,-0.0025 -0.0026,-1.064649 c -0.0038,-1.607821 -0.449645,-2.36184 -1.514612,-2.561627 -0.572871,-0.107472 -1.393515,0.263677 -1.702082,0.769789 -0.195498,0.320659 -0.232903,0.580298 -0.233265,1.619192 l -4.25e-4,1.237295 h -1.12656 c -0.940194,0 -1.211113,0.04284 -1.637501,0.258969 -0.911823,0.462175 -1.238494,1.559926 -0.71455,2.401192 0.397339,0.637989 0.639056,0.729347 2.09747,0.792756 l 1.323618,0.05755 0.05755,1.323619 c 0.06014,1.383222 0.154758,1.663359 0.68795,2.036821 0.579138,0.405644 1.239785,0.422433 1.897665,0.04823 z M 28.051598,37.042095 C 23.062233,36.418873 18.780612,32.725476 17.358495,27.818044 15.67366,22.00403 18.44977,15.656315 23.867225,12.935506 c 2.497687,-1.254414 5.02093,-1.66863 7.694839,-1.263188 2.790408,0.423107 5.148971,1.616342 7.149857,3.617228 6.209256,6.209257 4.488253,16.634919 -3.3835,20.496904 -2.348935,1.152417 -4.765259,1.569364 -7.276823,1.255645 z"
-       id="path1478" /></g></svg>
+       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /><path
+       sodipodi:nodetypes="csasccsassc"
+       d="m 33.346398,27.138373 c 2.012782,2.397011 3.817716,9.137224 3.780729,13.03223 -0.04053,4.268676 -4.147427,7.833723 -7.844104,7.839587 -3.89323,0.0062 -8.134746,-3.432459 -8.287329,-8.230168 C 20.876209,36.02303 22.815244,29.25428 24.970657,27.344578 24.73295,25.80496 23.829344,23.960201 21.144182,22.793431 19.6943,22.163465 15.581718,20.946417 15.626371,18.600543 c 0.04851,-2.548391 8.793599,-4.303905 13.521842,-4.28593 4.621336,0.01757 13.160147,1.682212 13.183878,4.289387 0.01639,1.800667 -5.45021,3.369885 -6.656712,4.623374 -1.535253,1.595043 -2.168834,3.07356 -2.328981,3.910999 z"
+       style="fill:#000000;fill-opacity:0.15686275;fill-rule:nonzero;stroke:none"
+       id="use4155"
+       inkscape:connector-curvature="0" /><path
+       inkscape:connector-curvature="0"
+       id="path4839"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 33.346398,28.617307 c 2.012782,2.397011 3.817716,9.137224 3.780729,13.03223 -0.04053,4.268677 -4.147427,7.833723 -7.844104,7.839587 -3.89323,0.0062 -8.134746,-3.432459 -8.287329,-8.230168 -0.119485,-3.756992 1.81955,-10.525742 3.974963,-12.435444 -0.237707,-1.539618 -1.141313,-3.384377 -3.826475,-4.551147 -1.449882,-0.629966 -5.562464,-1.847014 -5.517811,-4.192888 0.04851,-2.54839 8.793599,-4.303905 13.521842,-4.28593 4.621336,0.01757 13.160147,1.682212 13.183878,4.289387 0.01639,1.800667 -5.45021,3.369885 -6.656712,4.623374 -1.535253,1.595044 -2.168834,3.07356 -2.328981,3.910999 z"
+       sodipodi:nodetypes="csasccsassc" /><path
+       inkscape:connector-curvature="0"
+       id="path5440"
+       style="fill:#000000;fill-opacity:0.15686275;fill-rule:nonzero;stroke:none"
+       d="m 46.384917,23.38757 c -1.021112,0 -1.848668,0.827556 -1.848668,1.848667 l 0,3.697335 -3.697335,0 c -1.021112,0 -1.848668,0.827556 -1.848668,1.848668 0,1.021112 0.827556,1.848668 1.848668,1.848668 l 3.697335,0 0,3.697335 c 0,1.021111 0.827556,1.848668 1.848668,1.848668 1.021111,0 1.848667,-0.827557 1.848667,-1.848668 l 0,-3.697335 3.697336,0 c 1.021111,0 1.848667,-0.827556 1.848667,-1.848668 0,-1.021112 -0.827556,-1.848668 -1.848667,-1.848668 l -3.697336,0 0,-3.697335 c 0,-1.021111 -0.827556,-1.848667 -1.848667,-1.848667" /><path
+       inkscape:connector-curvature="0"
+       id="path5452"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 53.779587,32.010539 c 0,-1.021111 -0.827556,-1.848667 -1.848667,-1.848667 l -11.092006,0 c -1.021112,0 -1.848668,0.827556 -1.848668,1.848667 0,1.021112 0.827556,1.848668 1.848668,1.848668 l 11.092006,0 c 1.021111,0 1.848667,-0.827556 1.848667,-1.848668" /><path
+       inkscape:connector-curvature="0"
+       id="path5456"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 46.384917,24.615869 c -1.021112,0 -1.848668,0.827556 -1.848668,1.848667 l 0,11.092006 c 0,1.021112 0.827556,1.848668 1.848668,1.848668 1.021111,0 1.848667,-0.827556 1.848667,-1.848668 l 0,-11.092006 c 0,-1.021111 -0.827556,-1.848667 -1.848667,-1.848667" /></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 473fd4844..de468d270 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -208,7 +208,6 @@
     <file>images/logo/logo_info.png</file>
     <file>images/logo/logo_splash.png</file>
     <file>images/logo/logo_web_nobackground.png</file>
-    <file>images/logo/logo_web_nobackground_black.png</file>
     <file>images/mail-signed.png</file>
     <file>images/mail-signature-unknown.png</file>
     <file>images/mailforward24-hover.png</file>
diff --git a/retroshare-gui/src/gui/images/logo/logo_web_nobackground_black.png b/retroshare-gui/src/gui/images/logo/logo_web_nobackground_black.png
deleted file mode 100644
index 1be6fbdc0..000000000
Binary files a/retroshare-gui/src/gui/images/logo/logo_web_nobackground_black.png and /dev/null differ
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 47da8e913..4e0219b0c 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -36,7 +36,6 @@
 #include <QFileInfo>
 #include <QTextStream>
 #include <QScrollBar>
-#include <QActionGroup>
 
 #include <algorithm>
 
@@ -300,7 +299,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
 
     QFontDatabase db;
     foreach(int size, db.standardSizes())
-        ui.comboSize->addItem(QString::number(size), size);
+        ui.comboSize->addItem(QString::number(size));
 
     QStyleOptionComboBox opt; QSize sh;
     opt.initFrom(ui.comboSize);
@@ -409,10 +408,6 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
     ui.hashBox->setDropWidget(this);
     ui.hashBox->setAutoHide(true);
 
-    mMessageFontSizeHandler.registerFontSize(ui.msgText, [this, db] (QWidget*, int fontSize) {
-        ui.comboSize->setCurrentIndex(ui.comboSize->findData(fontSize));
-    });
-
 #if QT_VERSION < 0x040700
     // embedded images are not supported before QT 4.7.0
     ui.imagebtn->setVisible(false);
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h
index 27bf28458..040681095 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.h
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.h
@@ -28,7 +28,6 @@
 #include "ui_MessageComposer.h"
 
 #include "gui/msgs/MessageInterface.h"
-#include "util/FontSizeHandler.h"
 
 class QAction;
 struct RsIdentityDetails;
@@ -268,8 +267,6 @@ private:
 	bool has_gxs;
     bool mAlreadySent; // prevents a Qt bug that calls the same action twice.
 
-    MessageFontSizeHandler mMessageFontSizeHandler;
-
     /** Qt Designer generated object */
     Ui::MessageComposer ui;
 
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui
index a5ff266d4..9b5e8605c 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.ui
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui
@@ -349,10 +349,10 @@
                </size>
               </property>
               <property name="frameShape">
-               <enum>QFrame::StyledPanel</enum>
+               <enum>QFrame::Box</enum>
               </property>
               <property name="frameShadow">
-               <enum>QFrame::Raised</enum>
+               <enum>QFrame::Sunken</enum>
               </property>
               <layout class="QHBoxLayout" name="toolBarFrameHLayout">
                <property name="leftMargin">
@@ -1400,11 +1400,6 @@ border-image: url(:/images/closepressed.png)
   </action>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>RSComboBox</class>
-   <extends>QComboBox</extends>
-   <header>gui/common/RSComboBox.h</header>
-  </customwidget>
   <customwidget>
    <class>FriendSelectionWidget</class>
    <extends>QWidget</extends>
@@ -1416,16 +1411,21 @@ border-image: url(:/images/closepressed.png)
    <extends>QComboBox</extends>
    <header>gui/gxs/GxsIdChooser.h</header>
   </customwidget>
+  <customwidget>
+   <class>HashBox</class>
+   <extends>QScrollArea</extends>
+   <header location="global">gui/common/HashBox.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>MimeTextEdit</class>
    <extends>QTextEdit</extends>
    <header location="global">gui/common/MimeTextEdit.h</header>
   </customwidget>
   <customwidget>
-   <class>HashBox</class>
-   <extends>QScrollArea</extends>
-   <header location="global">gui/common/HashBox.h</header>
-   <container>1</container>
+   <class>RSComboBox</class>
+   <extends>QComboBox</extends>
+   <header>gui/common/RSComboBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.cpp b/retroshare-gui/src/gui/msgs/MessageModel.cpp
index dc2f16c7c..6116e42b4 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageModel.cpp
@@ -57,7 +57,6 @@ RsMessageModel::RsMessageModel(QObject *parent)
     mQuickViewFilter = QUICK_VIEW_ALL;
     mFilterType = FILTER_TYPE_NONE;
     mFilterStrings.clear();
-    mFont = QApplication::font();
 }
 
 void RsMessageModel::preMods()
@@ -210,8 +209,6 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const
     std::cerr << "calling data(" << index << ") role=" << role << std::endl;
 #endif
 
-	int coln = index.column();
-
 	if(!index.isValid())
 		return QVariant();
 
@@ -249,19 +246,11 @@ QVariant RsMessageModel::data(const QModelIndex &index, int role) const
 
     if(role == Qt::FontRole)
     {
-        QFont font = mFont;
+        QFont font ;
 		font.setBold(fmpe.msgflags & (RS_MSG_NEW | RS_MSG_UNREAD_BY_USER));
 
         return QVariant(font);
     }
-	
-	if (role == Qt::TextAlignmentRole)
-	{
-		if((coln == COLUMN_THREAD_ATTACHMENT))
-			return int( Qt::AlignHCenter | Qt::AlignVCenter);
-		else
-			return QVariant();
-	}
 
 #ifdef DEBUG_MESSAGE_MODEL
 	std::cerr << " [ok]" << std::endl;
@@ -405,15 +394,6 @@ void RsMessageModel::setFilter(FilterType filter_type, const QStringList& string
             emit dataChanged(createIndex(0,0),createIndex(rowCount()-1,RsMessageModel::columnCount()-1));
 }
 
-void RsMessageModel::setFont(const QFont &font)
-{
-	mFont = font;
-
-	if (rowCount() > 0) {
-		emit dataChanged(createIndex(0,0), createIndex(rowCount() - 1, RsMessageModel::columnCount() - 1));
-	}
-}
-
 QVariant RsMessageModel::toolTipRole(const Rs::Msgs::MsgInfoSummary& fmpe,int column) const
 {
     if(column == COLUMN_THREAD_AUTHOR || column == COLUMN_THREAD_TO)
@@ -450,7 +430,7 @@ QVariant RsMessageModel::backgroundRole(const Rs::Msgs::MsgInfoSummary &/*fmpe*/
 
 QVariant RsMessageModel::sizeHintRole(int col) const
 {
-	float factor = QFontMetricsF(mFont).height()/14.0f ;
+	float factor = QFontMetricsF(QApplication::font()).height()/14.0f ;
 
 	switch(col)
 	{
diff --git a/retroshare-gui/src/gui/msgs/MessageModel.h b/retroshare-gui/src/gui/msgs/MessageModel.h
index 3bbd6ee31..d23b21f86 100644
--- a/retroshare-gui/src/gui/msgs/MessageModel.h
+++ b/retroshare-gui/src/gui/msgs/MessageModel.h
@@ -22,7 +22,6 @@
 
 #include <QModelIndex>
 #include <QColor>
-#include <QFont>
 
 #include "retroshare/rsmsgs.h"
 
@@ -105,7 +104,6 @@ public:
     void setQuickViewFilter(QuickViewFilter fn) ;
 
     void setFilter(FilterType filter_type, const QStringList& strings) ;
-    void setFont(const QFont &font);
 
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
     int columnCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -186,7 +184,6 @@ private:
     QuickViewFilter mQuickViewFilter ;
     QStringList mFilterStrings;
     FilterType  mFilterType;
-    QFont mFont;
 
     std::vector<Rs::Msgs::MsgInfoSummary> mMessages;
     std::map<std::string,uint32_t> mMessagesMap;
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.cpp b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
index f4be23597..0d2e934f2 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.cpp
@@ -640,7 +640,7 @@ void MessageWidget::fill(const std::string &msgId)
 
     ui.trans_ToText->setText(to_text);
 
-	int recipientsCount = ui.trans_ToText->toPlainText().split(QRegExp("(\\s|\\n|\\r)+"), QtSkipEmptyParts).count();
+	int recipientsCount = ui.trans_ToText->toPlainText().split(QRegExp("(\\s|\\n|\\r)+"), QString::SkipEmptyParts).count();
 	ui.expandButton->setText( QString::number(recipientsCount)+ " " + tr("more"));
 
 	if (recipientsCount >=20) {
diff --git a/retroshare-gui/src/gui/msgs/MessageWidget.ui b/retroshare-gui/src/gui/msgs/MessageWidget.ui
index cd4a7c401..de580d7e5 100644
--- a/retroshare-gui/src/gui/msgs/MessageWidget.ui
+++ b/retroshare-gui/src/gui/msgs/MessageWidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>738</width>
+    <width>698</width>
     <height>539</height>
    </rect>
   </property>
@@ -59,6 +59,11 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
             <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
             </property>
@@ -206,6 +211,11 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
             <property name="text">
              <string>Tags:</string>
             </property>
@@ -222,6 +232,11 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
             <property name="text">
              <string>Subject:</string>
             </property>
@@ -238,6 +253,11 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
             <property name="text">
              <string>Cc:</string>
             </property>
@@ -257,6 +277,11 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
             <property name="text">
              <string>Bcc:</string>
             </property>
@@ -273,6 +298,11 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
             <property name="text">
              <string>To:</string>
             </property>
@@ -291,6 +321,7 @@
             </property>
             <property name="font">
              <font>
+              <pointsize>9</pointsize>
               <weight>75</weight>
               <bold>true</bold>
              </font>
@@ -342,6 +373,11 @@
               <height>16777215</height>
              </size>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
             <property name="scaledContents">
              <bool>true</bool>
             </property>
@@ -380,6 +416,11 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="font">
+             <font>
+              <pointsize>9</pointsize>
+             </font>
+            </property>
             <property name="text">
              <string>From:</string>
             </property>
@@ -819,8 +860,8 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../icons.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index 78493e5a7..be9eedf6b 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -306,23 +306,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
 
     mTagEventHandlerId = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [this,event]() { handleTagEvent_main_thread(event); }); }, mEventHandlerId, RsEventType::MAIL_TAG );
-
-    mFontSizeHandler.registerFontSize(ui.listWidget, 1.5f, [this] (QAbstractItemView*, int fontSize) {
-        // Set new font size on all items
-        QList<int> rows;
-        rows << ROW_INBOX << ROW_OUTBOX << ROW_DRAFTBOX;
-
-        foreach (int row, rows) {
-            QListWidgetItem *item = ui.listWidget->item(row);
-            QFont font = item->font();
-            font.setPointSize(fontSize);
-            item->setFont(font);
-        }
-    });
-    mFontSizeHandler.registerFontSize(ui.quickViewWidget, 1.5f);
-    mFontSizeHandler.registerFontSize(ui.messageTreeWidget, 1.5f, [this] (QAbstractItemView *view, int) {
-        mMessageModel->setFont(view->font());
-    });
 }
 
 void MessagesDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)
@@ -528,7 +511,7 @@ void MessagesDialog::fillQuickView()
 	ui.quickViewWidget->clear();
 
 	// add static items
-    item = new QListWidgetItem(tr("Starred"), ui.quickViewWidget);
+    item = new QListWidgetItem(tr("Stared"), ui.quickViewWidget);
     item->setIcon(FilesDefs::getIconFromQtResourcePath(IMAGE_STAR_ON));
 	item->setData(ROLE_QUICKVIEW_TYPE, QUICKVIEW_TYPE_STATIC);
 	item->setData(ROLE_QUICKVIEW_ID, QUICKVIEW_STATIC_ID_STARRED);
@@ -1246,7 +1229,7 @@ void MessagesDialog::undeletemessage()
 
 void MessagesDialog::filterChanged(const QString& text)
 {
-    QStringList items = text.split(' ',QtSkipEmptyParts);
+    QStringList items = text.split(' ',QString::SkipEmptyParts);
 
     RsMessageModel::FilterType f = RsMessageModel::FILTER_TYPE_NONE;
 
@@ -1287,7 +1270,7 @@ void MessagesDialog::filterColumnChanged(int column)
     default:break;
     }
 
-    QStringList items = ui.filterLineEdit->text().split(' ',QtSkipEmptyParts);
+    QStringList items = ui.filterLineEdit->text().split(' ',QString::SkipEmptyParts);
     mMessageModel->setFilter(f,items);
 	mMessageProxyModel->setFilterRegExp(QRegExp(RsMessageModel::FilterString));	// this triggers the update of the proxy model
 
@@ -1313,7 +1296,7 @@ void MessagesDialog::updateMessageSummaryList()
     /* calculating the new messages */
 
     std::list<MsgInfoSummary> msgList;
-    rsMail->getMessageSummaries(Rs::Msgs::BoxName::BOX_ALL,msgList);
+    rsMail->getMessageSummaries(mMessageModel->currentBox(),msgList);
 
     QMap<int, int> tagCount;
 
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.h b/retroshare-gui/src/gui/msgs/MessagesDialog.h
index 7f9573f81..1d10137c2 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.h
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.h
@@ -25,7 +25,6 @@
 
 #include <retroshare/rsevents.h>
 #include <retroshare-gui/mainpage.h>
-#include "util/FontSizeHandler.h"
 
 #include "ui_MessagesDialog.h"
 
@@ -167,8 +166,6 @@ private:
 
   RsEventsHandlerId_t mEventHandlerId;
   RsEventsHandlerId_t mTagEventHandlerId;
-
-  FontSizeHandler mFontSizeHandler;
 };
 
 #endif
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.ui b/retroshare-gui/src/gui/msgs/MessagesDialog.ui
index 516511265..5f1d83eca 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.ui
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.ui
@@ -139,6 +139,11 @@
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="font">
+               <font>
+                <pointsize>11</pointsize>
+               </font>
+              </property>
               <property name="contextMenuPolicy">
                <enum>Qt::CustomContextMenu</enum>
               </property>
@@ -248,6 +253,11 @@
                    <height>0</height>
                   </size>
                  </property>
+                 <property name="font">
+                  <font>
+                   <pointsize>11</pointsize>
+                  </font>
+                 </property>
                 </widget>
                </item>
               </layout>
@@ -365,6 +375,11 @@
               <enum>Qt::Vertical</enum>
              </property>
              <widget class="RSTreeView" name="messageTreeWidget">
+              <property name="font">
+               <font>
+                <pointsize>10</pointsize>
+               </font>
+              </property>
               <property name="contextMenuPolicy">
                <enum>Qt::CustomContextMenu</enum>
               </property>
@@ -451,7 +466,7 @@
   <customwidget>
    <class>LineEditClear</class>
    <extends>QLineEdit</extends>
-   <header>gui/common/LineEditClear.h</header>
+   <header location="global">gui/common/LineEditClear.h</header>
   </customwidget>
   <customwidget>
    <class>RSTabWidget</class>
diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.cpp b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
index 670bb86c7..cf823ab53 100644
--- a/retroshare-gui/src/gui/profile/ProfileWidget.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
@@ -45,13 +45,13 @@ ProfileWidget::ProfileWidget(QWidget *parent, Qt::WindowFlags flags)
     connect(ui.CopyCertButton,SIGNAL(clicked()), this, SLOT(copyCert()));
     connect(ui.profile_Button,SIGNAL(clicked()), this, SLOT(profilemanager()));
 
-    ui.onLineSince->setText(DateTime::formatLongDateTime(RsApplication::startupTime()));
+    ui.onLineSince->setText(DateTime::formatLongDateTime(Rshare::startupTime()));
 }
 
 void ProfileWidget::showEvent ( QShowEvent * /*event*/ )
 {
     /* set retroshare version */
-    ui.version->setText(RsApplication::retroshareVersion(true));
+    ui.version->setText(Rshare::retroshareVersion(true));
 
     RsPeerDetails detail;
     if (rsPeers->getPeerDetails(rsPeers->getOwnId(),detail))
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
index ffea0a4d8..7497440c5 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss
@@ -2436,7 +2436,7 @@ WireGroupItem QFrame#wire_frame QLabel{
 	background: transparent;
 }
 WireGroupItem QFrame#wire_frame:hover {
-	background-color: #346792;
+	background-color: #2e8bab;
 }
 
 PulseTopLevel QFrame#frame,
@@ -2446,6 +2446,13 @@ PulseReply QFrame#frame {
 	border-radius: 6px;
 }
 
+PulseAddDialog QTextEdit#textEdit_Pulse {
+	border: 2px solid #c4cfd6;
+	border-radius: 6px;
+	background: white;
+	color: black;
+}
+
 PulseReply #line_replyLine,
 PulseMessage #line{
 	color: #c4cfd6;
@@ -2455,16 +2462,6 @@ PulseReply QLabel#label_groupName{
 	color: #5b7083;
 }
 
-PulseReplySeperator QFrame#frame {
-	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #455364, stop: 0.5 #54687A,stop: 0.6 #44586A, stop:1 #455364);
-	border-radius: 10px;
-}
-
-QLabel#label_masthead{
-	border: 2px solid #CCCCCC;
-	border-radius: 4px;
-}
-
 /**** Color definitions ****/
 
 ForumsDialog, GxsForumThreadWidget
@@ -2555,3 +2552,10 @@ OpModeStatus[opMode="Minimal"] {
 [WrongValue="true"] {
 	background-color: #702020;
 }
+
+/**** The Wire ****/
+
+QLabel#label_masthead{
+	border: 2px solid #CCCCCC;
+	border-radius: 4px;
+}
diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
index 40fe0b78c..061ca0518 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss
@@ -231,7 +231,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
 --------------------------------------------------------------------------- */
 QGroupBox {
   font-weight: bold;
-  border: 1px solid #C0C4C8;
+  border: 1px solid #C9CDD0;
   border-radius: 4px;
   padding: 2px;
   margin-top: 6px;
@@ -1234,7 +1234,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
 
 --------------------------------------------------------------------------- */
 QComboBox {
-  border: 1px solid #C0C4C8;
+  border: 1px solid #C9CDD0;
   border-radius: 4px;
   selection-background-color: #9FCBFF;
   padding-left: 4px;
@@ -1250,7 +1250,7 @@ QComboBox {
 }
 
 QComboBox QAbstractItemView {
-  border: 1px solid #C0C4C8;
+  border: 1px solid #C9CDD0;
   border-radius: 0;
   background-color: #FAFAFA;
   selection-background-color: #9FCBFF;
@@ -1263,7 +1263,7 @@ QComboBox QAbstractItemView:hover {
 
 QComboBox QAbstractItemView:selected {
   background: #9FCBFF;
-  color: #C0C4C8;
+  color: #C9CDD0;
 }
 
 QComboBox QAbstractItemView:alternate {
@@ -1301,18 +1301,6 @@ QComboBox::indicator:alternate {
   background: #FAFAFA;
 }
 
-QComboBox::item {
-  /* Remove to fix #282, #285 and MR #288*/
-  /*&:checked {
-            font-weight: bold;
-        }
-
-        &:selected {
-            border: 0px solid transparent;
-        }
-        */
-}
-
 QComboBox::item:alternate {
   background: #FAFAFA;
 }
@@ -1445,14 +1433,14 @@ QLineEdit {
   padding-left: 4px;
   padding-right: 4px;
   border-style: solid;
-  border: 1px solid #C0C4C8;
+  border: 1px solid #C9CDD0;
   border-radius: 4px;
   color: #19232D;
 }
 
 QLineEdit:disabled {
   background-color: #FAFAFA;
-  color: #9DA9B5;
+  color: #788D9C;
 }
 
 QLineEdit:hover {
@@ -2163,12 +2151,12 @@ QSplitter::handle:hover {
 }
 
 QSplitter::handle:horizontal {
-  width: 2px;
+  width: 5px;
   image: url(":/standard_light/rc/line_vertical.png");
 }
 
 QSplitter::handle:vertical {
-  height: 2px;
+  height: 5px;
   image: url(":/standard_light/rc/line_horizontal.png");
 }
 
@@ -2362,6 +2350,51 @@ QFrame#titleBarFrame QTextEdit {
 	background: white;
 }
 
+/**** Special Page tweak ****/
+
+
+/* ConnectFriendWizard */
+
+ConnectFriendWizard QPlainTextEdit#friendCertEdit {
+	border: none;
+	background: white;
+	color: black;
+}
+
+ConnectFriendWizard QFrame#friendFrame {
+	border: 2px solid #0099cc;
+	border-radius: 6px;
+	background: white;
+}
+
+ConnectFriendWizard QWizardPage#ConclusionPage > QGroupBox#peerDetailsFrame {
+	border: 2px solid #039bd5;
+	border-radius:6px;
+	background: white;
+	color: black;
+	padding: 12 12px;
+}
+
+ConnectFriendWizard QGroupBox::title#peerDetailsFrame
+{
+	padding: 4 12px;
+	background: transparent;
+	padding: 4 12px;
+	background: #039bd5;
+	color: white;
+}
+
+
+/* GetStartedDialog */
+
+GetStartedDialog QTextEdit {
+	border: 1px solid #B8B6B1;
+	border-radius: 6px;
+	background: white;
+	color: black;
+}
+
+
 /* HomePage */
 
 HomePage QLabel#userCertLabel {
@@ -2476,7 +2509,7 @@ GxsGroupDialog QLabel#groupLogo{
 
 /* Settings */
 
-PluginItem QFrame#pluginFrame {
+PluginItem > QFrame#pluginFrame {
 	border: 2px solid #A8B8D1;
 	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FCFDFE, stop: 1 #E2E8EF);
 	border-radius: 0px
@@ -2488,7 +2521,7 @@ PluginItem QLabel#infoLabel {
 
 /* Feeds */
 
-AttachFileItem QFrame#frame {
+AttachFileItem > QFrame#frame {
 	border: 2px solid black;
 	background: white;
 }
@@ -2594,78 +2627,82 @@ BoardPostDisplayWidget_card QLabel#siteBoldLabel {
 	color: #787c7e;
 }
 
-/* GenCertDialog
-   Change colors here because GUI is not started yet so no user StyleSheet loads */
 
-GenCertDialog QFrame#profileframe{
-	border-image: url(:/images/logo/background.png) 0 0 0 0 stretch stretch;
-	border-width: 0px;
+/* MessengerWindow */
+
+MessengerWindow QFrame#messengerframetop{
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
+	border: 0px;
 }
 
-GenCertDialog QFrame#profileframe QCheckBox,
-GenCertDialog QFrame#profileframe QLabel {
+
+/*************** Optional ***************/
+
+/**** WikiPoos ****/
+WikiEditDialog QPushButton#pushButton_History {
+	color: white;
+	background: #5bb62b;
+	border-radius: 4px;
+	max-height: 20px;
+	min-width: 4em;
+	padding: 2px;
+	padding-left: 6px;
+	padding-right: 6px;
+}
+
+WikiEditDialog QPushButton#pushButton_History:hover {
+	background: #57af29;
+}
+
+
+/**** The Wire ****/
+
+WireGroupItem QFrame#wire_frame:hover {
+	background-color: #7ecbfb;
+}
+WireGroupItem QFrame#wire_frame > QLabel {
 	background: transparent;
 }
 
-GenCertDialog QLabel#info_Label:enabled {
-	color: black;
-	border: 1px solid #DCDC41;
-	border-radius: 6px;
-	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
+PulseTopLevel QFrame#plainFrame,
+PulseViewGroup QFrame#plainFrame,
+PulseReply QFrame#plainFrame {
+	border: 2px solid #c4cfd6;
+	background: white;
 }
 
-GenCertDialog QGroupBox#groupBox,
-GenCertDialog QGroupBox#profile_groupBox {
-	background: rgba(0,0,0,10%);
-}
-GenCertDialog QGroupBox#profile_groupBox QComboBox,
-GenCertDialog QGroupBox#profile_groupBox QSpinBox,
-GenCertDialog QGroupBox#profile_groupBox QLineEdit,
-GenCertDialog QComboBox#genPGPuser {
-	border: 2px solid #0099cc;
+PulseAddDialog QTextEdit#textEdit_Pulse {
+	border: 2px solid #c4cfd6;
 	border-radius: 6px;
 	background: white;
 	color: black;
 }
 
-GenCertDialog QPushButton#genButton {
-	border-image: url(:/images/btn_blue.png) 4;
-	border-width: 4;
-	color: white;
-}
-GenCertDialog QPushButton#genButton:hover {
-	border-image: url(:/images/btn_blue_hover.png) 4;
-}
-GenCertDialog QPushButton#genButton:disabled {
-	border-image: url(:/images/btn_27.png) 4;
-	color: black;
+PulseReply #line_replyLine,
+PulseMessage #line{
+	color: #c4cfd6;
 }
 
-/* StartDialog
-   To get the same style for all user and not use last connected one. */
-   
-StartDialog QFrame#loginframe{
-	border-image: url(:/images/logo/background_lessblue.png) 0 0 0 0 stretch stretch;
-	border-width: 0px;
+PulseReply QLabel#label_groupName{
+	color: #5b7083;
 }
 
-StartDialog QFrame#loginframe QCheckBox,
-StartDialog QFrame#loginframe QLabel {
-	background: transparent;
-}
-StartDialog QGroupBox#profilGBox {
-	background: rgba(0,0,0,10%);
-	border-radius: 3px;
-	border-width: 0px;
+QLabel#label_masthead{
+	border: 2px solid #CCCCCC;
+	border-radius: 4px;
 }
 
-StartDialog QPushButton#loadButton {
-	background: transparent;
-	border-image: url(:/images/btn_blue.png) 4;
-	border-width: 4;
-	color: white;
+/**** PhotoShare ****/
+AlbumItem QFrame#albumFrame {
+	border: 2px solid #CCCCCC;
+	border-radius: 10px
 }
-StartDialog QPushButton#loadButton:hover {
-	background: transparent;
-	border-image: url(:/images/btn_blue_hover.png) 4;
+
+PhotoItem QFrame#photoFrame {
+	border: 2px solid #CCCCCC;
+	border-radius: 10px
+}
+
+PhotoItem QWidget:hover {
+	background-color: #7ecbfb;
 }
diff --git a/retroshare-gui/src/gui/qss/stylesheet/default.qss b/retroshare-gui/src/gui/qss/stylesheet/default.qss
index 4b8d1645f..d1730bfef 100644
--- a/retroshare-gui/src/gui/qss/stylesheet/default.qss
+++ b/retroshare-gui/src/gui/qss/stylesheet/default.qss
@@ -141,6 +141,88 @@ QLabel#newLabel:enabled {
 }
 
 
+/* StartDialog
+   To get the same style for all user and not use last connected one. */
+
+StartDialog QFrame#loginframe{
+	border-image: url(:/images/logo/background_lessblue.png) 0 0 0 0 stretch stretch;
+	border-width: 0px;
+}
+StartDialog QFrame#loginframe QCheckBox,
+StartDialog QFrame#loginframe QLabel {
+	background: transparent;
+}
+StartDialog QGroupBox#profilGBox {
+	background: rgba(0,0,0,10%);
+	border-radius: 3px;
+	border-width: 0px;
+}
+
+StartDialog QGroupBox#profilGBox * {
+	background-color: white;
+	color: black;
+}
+
+StartDialog QPushButton#loadButton {
+	background: transparent;
+	border-image: url(:/images/btn_blue.png) 4;
+	border-width: 4;
+	color: white;
+}
+StartDialog QPushButton#loadButton:hover {
+	background: transparent;
+	border-image: url(:/images/btn_blue_hover.png) 4;
+}
+
+
+
+/* GenCertDialog
+   Change colors here because GUI is not started yet so no user StyleSheet loads */
+
+GenCertDialog QFrame#profileframe{
+	border-image: url(:/images/logo/background.png) 0 0 0 0 stretch stretch;
+	border-width: 0px;
+}
+GenCertDialog QFrame#profileframe QCheckBox,
+GenCertDialog QFrame#profileframe QLabel {
+	background: transparent;
+}
+
+GenCertDialog QLabel#info_Label:enabled {
+	color: black;
+	border: 1px solid #DCDC41;
+	border-radius: 6px;
+	background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
+}
+
+GenCertDialog QGroupBox#groupBox,
+GenCertDialog QGroupBox#profile_groupBox {
+	background: rgba(0,0,0,10%);
+}
+GenCertDialog QGroupBox#profile_groupBox QComboBox,
+GenCertDialog QGroupBox#profile_groupBox QSpinBox,
+GenCertDialog QGroupBox#profile_groupBox QLineEdit,
+GenCertDialog QComboBox#genPGPuser {
+	border: 2px solid #0099cc;
+	border-radius: 6px;
+	background: white;
+	color: black;
+}
+
+GenCertDialog QPushButton#genButton {
+	border-image: url(:/images/btn_blue.png) 4;
+	border-width: 4;
+	color: white;
+}
+GenCertDialog QPushButton#genButton:hover {
+	border-image: url(:/images/btn_blue_hover.png) 4;
+}
+GenCertDialog QPushButton#genButton:disabled {
+	border-image: url(:/images/btn_27.png) 4;
+	color: black;
+}
+
+
 /* AvatarWidget */
 
 AvatarWidget{border-width: 10px;}
@@ -270,9 +352,9 @@ NewFriendList
 {
 	qproperty-textColorStatusOffline: black;
 	qproperty-textColorStatusAway: gray;
-	qproperty-textColorStatusBusy: darkred;
+	qproperty-textColorStatusBusy: gray;
 	qproperty-textColorStatusOnline: darkGreen;
-	qproperty-textColorStatusInactive: orange;
+	qproperty-textColorStatusInactive: gray;
 	qproperty-textColorGroup: rgb(123, 123, 123);
 }
 
@@ -336,27 +418,3 @@ OpModeStatus[opMode="Minimal"] {
 [WrongValue="true"] {
 	background-color: #FF8080;
 }
-
-GenCertDialog QPushButton#genButton {
-	border-image: url(:/images/btn_blue.png) 4;
-	border-width: 4;
-	color: white;
-}
-GenCertDialog QPushButton#genButton:hover {
-	border-image: url(:/images/btn_blue_hover.png) 4;
-}
-GenCertDialog QPushButton#genButton:disabled {
-	border-image: url(:/images/btn_27.png) 4;
-	color: black;
-}
-
-StartDialog QPushButton#loadButton {
-	background: transparent;
-	border-image: url(:/images/btn_blue.png) 4;
-	border-width: 4;
-	color: white;
-}
-StartDialog QPushButton#loadButton:hover {
-	background: transparent;
-	border-image: url(:/images/btn_blue_hover.png) 4;
-}
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp
index 2aecd6024..8ad086ae9 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.cpp
+++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp
@@ -84,7 +84,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
 	}
 
 	QMap<QString, QString> styleSheets;
-	RsApplication::getAvailableStyleSheets(styleSheets);
+	Rshare::getAvailableStyleSheets(styleSheets);
 
 	foreach (QString name, styleSheets.keys()) {
 		ui.cmboStyleSheet->addItem(name, styleSheets[name]);
@@ -101,9 +101,6 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
 
 	connect(ui.mainPageButtonType_CB,  SIGNAL(currentIndexChanged(int)),           this, SLOT(updateRbtPageOnToolBar()    ));
 //	connect(ui.menuItemsButtonType_CB, SIGNAL(currentIndexChanged(int)),           this, SLOT(updateActionButtonLoc()    ));
-
-	connect(ui.minimumFontSize_SB, SIGNAL(valueChanged(int)), this, SLOT(updateFontSize())) ;
-
 }
 
 void AppearancePage::switch_status_grpStatus(bool b)        { switch_status(MainWindow::StatusGrpStatus  ,"ShowStatusBar",         b) ; }
@@ -139,7 +136,7 @@ void AppearancePage::updateInterfaceStyle()
 #ifndef QT_NO_CURSOR
 	QApplication::setOverrideCursor(Qt::WaitCursor);
 #endif
-	RsApplication::setStyle(ui.cmboStyle->currentText());
+	Rshare::setStyle(ui.cmboStyle->currentText());
 	Settings->setInterfaceStyle(ui.cmboStyle->currentText());
 #ifndef QT_NO_CURSOR
 	QApplication::restoreOverrideCursor();
@@ -155,7 +152,7 @@ void AppearancePage::loadStyleSheet(int index)
 #ifndef QT_NO_CURSOR
 	QApplication::setOverrideCursor(Qt::WaitCursor);
 #endif
-	RsApplication::loadStyleSheet(ui.cmboStyleSheet->itemData(index).toString());
+	Rshare::loadStyleSheet(ui.cmboStyleSheet->itemData(index).toString());
 #ifndef QT_NO_CURSOR
 	QApplication::restoreOverrideCursor();
 #endif
@@ -254,7 +251,7 @@ void AppearancePage::updateCmboToolButtonSize()
 //     NotifyQt::getInstance()->notifySettingsChanged();
 // }
 
-void AppearancePage::updateStyle() { RsApplication::setStyle(ui.cmboStyle->currentText()); }
+void AppearancePage::updateStyle() { Rshare::setStyle(ui.cmboStyle->currentText()); }
 
 /** Loads the settings for this page */
 void AppearancePage::load()
@@ -262,7 +259,7 @@ void AppearancePage::load()
 	int index = ui.cmboLanguage->findData(Settings->getLanguageCode());
 	whileBlocking(ui.cmboLanguage)->setCurrentIndex(index);
 
-	index = ui.cmboStyle->findData(RsApplication::style().toLower());
+	index = ui.cmboStyle->findData(Rshare::style().toLower());
 	whileBlocking(ui.cmboStyle)->setCurrentIndex(index);
 
 	index = ui.cmboStyleSheet->findData(Settings->getSheetName());
@@ -362,12 +359,4 @@ void AppearancePage::load()
 	whileBlocking(ui.checkBoxShowToasterDisable)->setChecked(Settings->valueFromGroup("StatusBar", "ShowToaster", QVariant(true)).toBool());
 	whileBlocking(ui.checkBoxShowSystrayOnStatus)->setChecked(Settings->valueFromGroup("StatusBar", "ShowSysTrayOnStatusBar", QVariant(false)).toBool());
 
-	whileBlocking(ui.minimumFontSize_SB)->setValue(Settings->getFontSize());
-}
-
-void AppearancePage::updateFontSize()
-{
-	Settings->setFontSize(ui.minimumFontSize_SB->value());
-
-	NotifyQt::getInstance()->notifySettingsChanged();
 }
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h
index 741bd752e..897563753 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.h
+++ b/retroshare-gui/src/gui/settings/AppearancePage.h
@@ -71,8 +71,6 @@ private slots:
 //	void updateCmboListItemSize();
 
 	void updateStyle() ;
-	void updateFontSize();
-
 private:
 	void switch_status(MainWindow::StatusElement s,const QString& key,bool b);
 
diff --git a/retroshare-gui/src/gui/settings/AppearancePage.ui b/retroshare-gui/src/gui/settings/AppearancePage.ui
index 13dc7a48e..96e5effe8 100755
--- a/retroshare-gui/src/gui/settings/AppearancePage.ui
+++ b/retroshare-gui/src/gui/settings/AppearancePage.ui
@@ -14,7 +14,22 @@
    <enum>Qt::NoContextMenu</enum>
   </property>
   <layout class="QGridLayout" name="AppearancePageGLayout">
-   <item row="0" column="0" colspan="2">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="grpLanguage">
      <property name="minimumSize">
       <size>
@@ -71,12 +86,110 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="grpStyle">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>64</height>
+      </size>
+     </property>
+     <property name="contextMenuPolicy">
+      <enum>Qt::NoContextMenu</enum>
+     </property>
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="title">
+      <string>Style</string>
+     </property>
+     <layout class="QGridLayout" name="grpStyleGLayout">
+      <item row="0" column="0">
+       <widget class="RSComboBox" name="cmboStyle">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Choose RetroShare's interface style</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <spacer name="grpStyleHSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>215</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="grpStyleSheet">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>64</height>
+      </size>
+     </property>
+     <property name="title">
+      <string>Style Sheet</string>
+     </property>
+     <layout class="QGridLayout" name="grpStyleSheetGLayout">
+      <item row="0" column="0">
+       <widget class="RSComboBox" name="cmboStyleSheet">
+        <property name="minimumSize">
+         <size>
+          <width>150</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <spacer name="grpStyleSheetHSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>215</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="8" column="0">
+    <spacer name="AppearancePageVSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>361</width>
+       <height>61</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0">
     <widget class="QGroupBox" name="grpToolBar">
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>0</height>
+       <height>228</height>
       </size>
      </property>
      <property name="contextMenuPolicy">
@@ -85,8 +198,8 @@
      <property name="title">
       <string>Tool Bar</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLabel" name="labelPageToolBar">
@@ -124,7 +237,7 @@
         </item>
        </layout>
       </item>
-      <item row="1" column="0">
+      <item>
        <widget class="QFrame" name="frameToolListStyle">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -176,6 +289,19 @@
            </property>
           </widget>
          </item>
+         <item row="3" column="0">
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
          <item row="1" column="0">
           <widget class="RSComboBox" name="cmboTollButtonsSize">
            <item>
@@ -226,79 +352,10 @@
         </layout>
        </widget>
       </item>
-      <item row="2" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QGroupBox" name="grpFonts">
-     <property name="title">
-      <string>Fonts</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <layout class="QHBoxLayout" name="minimumFontSizeHLayout">
-        <item>
-         <widget class="QLabel" name="minimumFontSizeLabel">
-          <property name="text">
-           <string>Minimum font size </string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="minimumFontSize_SB">
-          <property name="minimum">
-           <number>5</number>
-          </property>
-          <property name="maximum">
-           <number>64</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="minimumFontSizeHSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item row="1" column="0">
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>188</width>
-          <height>96</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2">
+   <item row="7" column="0">
     <widget class="QGroupBox" name="grpStatus">
      <property name="title">
       <string>Status Bar</string>
@@ -407,104 +464,6 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2">
-    <spacer name="AppearancePageVSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>361</width>
-       <height>61</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QGroupBox" name="grpStyle">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>64</height>
-      </size>
-     </property>
-     <property name="contextMenuPolicy">
-      <enum>Qt::NoContextMenu</enum>
-     </property>
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="title">
-      <string>Style</string>
-     </property>
-     <layout class="QGridLayout" name="grpStyleGLayout">
-      <item row="0" column="0">
-       <widget class="RSComboBox" name="cmboStyle">
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Choose RetroShare's interface style</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <spacer name="grpStyleHSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>215</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QGroupBox" name="grpStyleSheet">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>64</height>
-      </size>
-     </property>
-     <property name="title">
-      <string>Style Sheet</string>
-     </property>
-     <layout class="QGridLayout" name="grpStyleSheetGLayout">
-      <item row="0" column="0">
-       <widget class="RSComboBox" name="cmboStyleSheet">
-        <property name="minimumSize">
-         <size>
-          <width>150</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <spacer name="grpStyleSheetHSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>215</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 296f6aec3..6c171bb1a 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -34,7 +34,6 @@
 #include <gui/connect/ConfCertDialog.h>
 #include <gui/profile/ProfileManager.h>
 #include <gui/statistics/StatisticsWindow.h>
-#include <gui/common/NewFriendList.h>
 
 #include <retroshare/rspeers.h> //for rsPeers variable
 #include <retroshare/rsdisc.h> //for rsPeers variable
@@ -59,16 +58,15 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WindowFlags flags)
 	// hide profile manager as it causes bugs when generating a new profile.
 	//ui.profile_Button->hide() ;
 
-	//connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager()));
-	connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(exportProfile()));
-	connect(ui.exportfriendslist,SIGNAL(clicked()), this, SLOT(exportFriendsList()) );
+    //connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(profilemanager()));
+    connect(ui.exportprofile,SIGNAL(clicked()), this, SLOT(exportProfile()));
 
     // Remove this because it duplicates functionality of the HomePage.
     ui.retroshareId_LB->hide();
     ui.retroshareId_content_LB->hide();
     ui.stackPageCertificate->hide();
 
-	ui.onlinesince->setText(DateTime::formatLongDateTime(RsApplication::startupTime()));
+	ui.onlinesince->setText(DateTime::formatLongDateTime(Rshare::startupTime()));
 }
 
 #ifdef UNUSED_CODE
@@ -113,7 +111,7 @@ void CryptoPage::showEvent ( QShowEvent * /*event*/ )
         ui.retroshareId_content_LB->setText(QString::fromUtf8(invite.c_str()));
 		
         /* set retroshare version */
-        ui.version->setText(RsApplication::retroshareVersion(true));
+        ui.version->setText(Rshare::retroshareVersion(true));
 
         std::list<RsPgpId> ids;
         ids.clear();
@@ -231,8 +229,3 @@ void CryptoPage::showStats()
 {
     StatisticsWindow::showYourself();
 }
-
-void CryptoPage::exportFriendsList()
-{
-	NewFriendList().exportFriendlistClicked();
-}
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.h b/retroshare-gui/src/gui/settings/CryptoPage.h
index e10cbb97a..e595c63c4 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.h
+++ b/retroshare-gui/src/gui/settings/CryptoPage.h
@@ -51,7 +51,6 @@ class CryptoPage : public ConfigPage
       bool fileSave();
       bool fileSaveAs();
       void showStats();
-      void exportFriendsList();
 
   private:
       QString fileName;
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.ui b/retroshare-gui/src/gui/settings/CryptoPage.ui
index c0d602368..29a336721 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.ui
+++ b/retroshare-gui/src/gui/settings/CryptoPage.ui
@@ -13,11 +13,25 @@
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <widget class="QStackedWidget" name="stackedWidget">
-     <widget class="QWidget" name="stackPageNodeInfo">
+     <widget class="QWidget" name="stackPageNodeInfo" native="true">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QGroupBox" name="groupBox_1">
          <layout class="QGridLayout" name="gridLayout_4">
+          <item row="6" column="0">
+           <widget class="QLabel" name="retroshareId_LB">
+            <property name="text">
+             <string>Retroshare ID:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Statistics:</string>
+            </property>
+           </widget>
+          </item>
           <item row="3" column="1" colspan="3">
            <widget class="QLabel" name="peerid">
             <property name="sizePolicy">
@@ -37,6 +51,13 @@
             </property>
            </widget>
           </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>PGP fingerprint:</string>
+            </property>
+           </widget>
+          </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_6">
             <property name="sizePolicy">
@@ -56,6 +77,99 @@
             </property>
            </widget>
           </item>
+          <item row="14" column="2">
+           <spacer name="horizontalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Expanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="8" column="1" colspan="2">
+           <widget class="QLabel" name="friendsEdit">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="0">
+           <widget class="QLabel" name="label_11">
+            <property name="text">
+             <string>Export Profile:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1" colspan="3">
+           <widget class="QLabel" name="pgpfingerprint">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1" colspan="3">
+           <widget class="QLabel" name="pgpid">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="10" column="0">
+           <widget class="QLabel" name="label_16">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Online since:</string>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_8">
             <property name="sizePolicy">
@@ -75,36 +189,23 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="retroshareId_LB">
-            <property name="text">
-             <string>Retroshare ID:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="12" column="0" colspan="3">
-           <layout class="QGridLayout" name="gridLayout_6">
-            <property name="topMargin">
-             <number>6</number>
-            </property>
+          <item row="0" column="0" colspan="4">
+           <layout class="QGridLayout" name="gridLayout_3">
             <item row="0" column="0">
-             <widget class="QLabel" name="otherIcon_2">
+             <widget class="QLabel" name="publicIcon">
               <property name="maximumSize">
                <size>
                 <width>16</width>
                 <height>16</height>
                </size>
               </property>
-              <property name="text">
-               <string/>
-              </property>
               <property name="pixmap">
                <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
-             <widget class="QLabel" name="otherLabel_2">
+             <widget class="QLabel" name="publicLabel">
               <property name="font">
                <font>
                 <pointsize>12</pointsize>
@@ -113,7 +214,7 @@
                </font>
               </property>
               <property name="text">
-               <string>Profile</string>
+               <string>Public Information</string>
               </property>
              </widget>
             </item>
@@ -138,10 +239,39 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="label_2">
+          <item row="14" column="1">
+           <widget class="QPushButton" name="exportprofile">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
             <property name="text">
-             <string>PGP fingerprint:</string>
+             <string>Export</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Software Version:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="1">
+           <widget class="QPushButton" name="showStats_PB">
+            <property name="text">
+             <string>Show statistics</string>
             </property>
            </widget>
           </item>
@@ -182,17 +312,117 @@
             </item>
            </layout>
           </item>
-          <item row="11" column="1">
-           <widget class="QPushButton" name="showStats_PB">
+          <item row="11" column="2">
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="13" column="0">
+           <widget class="QLabel" name="label_5">
             <property name="text">
-             <string>Show statistics</string>
+             <string>Profile path:</string>
             </property>
            </widget>
           </item>
-          <item row="14" column="0">
-           <widget class="QLabel" name="label_11">
+          <item row="8" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="text">
-             <string>Export Profile:</string>
+             <string>Friend nodes:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" colspan="3">
+           <widget class="QLabel" name="name">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string notr="true">TextLabel</string>
+            </property>
+           </widget>
+          </item>
+          <item row="12" column="0" colspan="3">
+           <layout class="QGridLayout" name="gridLayout_6">
+            <property name="topMargin">
+             <number>6</number>
+            </property>
+            <item row="0" column="0">
+             <widget class="QLabel" name="otherIcon_2">
+              <property name="maximumSize">
+               <size>
+                <width>16</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="otherLabel_2">
+              <property name="font">
+               <font>
+                <pointsize>12</pointsize>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
+              </property>
+              <property name="text">
+               <string>Profile</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Name:</string>
             </property>
            </widget>
           </item>
@@ -218,8 +448,8 @@
             </property>
            </widget>
           </item>
-          <item row="8" column="0">
-           <widget class="QLabel" name="label_9">
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_7">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -233,7 +463,23 @@
              </size>
             </property>
             <property name="text">
-             <string>Friend nodes:</string>
+             <string>PGP Id :</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1" colspan="3">
+           <widget class="QLabel" name="retroshareId_content_LB">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>TextLabel</string>
+            </property>
+            <property name="textInteractionFlags">
+             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
             </property>
            </widget>
           </item>
@@ -256,100 +502,6 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_7">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>PGP Id :</string>
-            </property>
-           </widget>
-          </item>
-          <item row="14" column="1">
-           <widget class="QPushButton" name="exportprofile">
-            <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-            </property>
-            <property name="text">
-             <string>Export profile</string>
-            </property>
-           </widget>
-          </item>
-          <item row="11" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Statistics:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1" colspan="3">
-           <widget class="QLabel" name="name">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string notr="true">TextLabel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="10" column="0">
-           <widget class="QLabel" name="label_16">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Online since:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="13" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>Profile path:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="11" column="2">
-           <spacer name="horizontalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
           <item row="13" column="1" colspan="2">
            <widget class="QLabel" name="labelpath">
             <property name="font">
@@ -363,172 +515,6 @@
             </property>
            </widget>
           </item>
-          <item row="8" column="1" colspan="2">
-           <widget class="QLabel" name="friendsEdit">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string notr="true">TextLabel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="9" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Software Version:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1" colspan="3">
-           <widget class="QLabel" name="retroshareId_content_LB">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>TextLabel</string>
-            </property>
-            <property name="textInteractionFlags">
-             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1" colspan="3">
-           <widget class="QLabel" name="pgpid">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string notr="true">TextLabel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1" colspan="3">
-           <widget class="QLabel" name="pgpfingerprint">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>TextLabel</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_10">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Name:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" colspan="4">
-           <layout class="QGridLayout" name="gridLayout_3">
-            <item row="0" column="0">
-             <widget class="QLabel" name="publicIcon">
-              <property name="maximumSize">
-               <size>
-                <width>16</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="../images.qrc">:/images/info16.png</pixmap>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="publicLabel">
-              <property name="font">
-               <font>
-                <pointsize>12</pointsize>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Public Information</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="15" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Export Friendslist:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="15" column="1">
-           <widget class="QPushButton" name="exportfriendslist">
-            <property name="text">
-             <string>Export friends list</string>
-            </property>
-           </widget>
-          </item>
-          <item row="14" column="2" rowspan="2">
-           <spacer name="horizontalSpacer_4">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Expanding</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
          </layout>
         </widget>
        </item>
@@ -547,7 +533,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="stackPageCertificate">
+     <widget class="QWidget" name="stackPageCertificate" native="true">
       <layout class="QGridLayout" name="gridLayout_7">
        <item row="0" column="0">
         <widget class="QPlainTextEdit" name="certplainTextEdit">
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui
index 3eea0544f..ab2863f1c 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.ui
+++ b/retroshare-gui/src/gui/settings/GeneralPage.ui
@@ -146,10 +146,10 @@
       <item row="5" column="0">
        <widget class="QCheckBox" name="useLocalServer">
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When checked, this retroshare instance will accept calls by your operating system to open Retroshare collection files, and download links.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>When checked, this instance receives new parameters (like RsLink or RsFile) and avoid new one.</string>
         </property>
         <property name="text">
-         <string>Accept operating systems calls</string>
+         <string>Use Local Server to get new arguments.</string>
         </property>
         <property name="checked">
          <bool>true</bool>
diff --git a/retroshare-gui/src/gui/settings/JsonApiPage.cc b/retroshare-gui/src/gui/settings/JsonApiPage.cc
index ace092e0c..2b7f25d80 100644
--- a/retroshare-gui/src/gui/settings/JsonApiPage.cc
+++ b/retroshare-gui/src/gui/settings/JsonApiPage.cc
@@ -232,23 +232,23 @@ void JsonApiPage::addTokenClicked()
 	whileBlocking(ui.tokensListView)->setModel(new QStringListModel(newTk));
 }
 
-void JsonApiPage::removeTokenClicked()
-{
-    QString token(ui.tokenLineEdit->text());
-    std::string tokenStr = token.toStdString();
-    rsJsonApi->revokeAuthToken(tokenStr.substr(0, tokenStr.find_first_of(":")));
-
-    QStringList newTk;
-
-    for(const auto& it : rsJsonApi->getAuthorizedTokens())
-        newTk.push_back(
-                    QString::fromStdString(it.first) + ":" +
-                    QString::fromStdString(it.second) );
-
-    whileBlocking(ui.tokensListView)->setModel(new QStringListModel(Settings->getJsonApiAuthTokens()) );
-}
-
+void JsonApiPage::removeTokenClicked()
+{
+	QString token(ui.tokenLineEdit->text());
+	rsJsonApi->revokeAuthToken(token.toStdString());
+
+    QStringList newTk;
+
+	for(const auto& it : rsJsonApi->getAuthorizedTokens())
+		newTk.push_back(
+		            QString::fromStdString(it.first) + ":" +
+		            QString::fromStdString(it.second) );
+
+	whileBlocking(ui.tokensListView)->setModel(new QStringListModel(Settings->getJsonApiAuthTokens()) );
+}
+
 void JsonApiPage::tokenClicked(const QModelIndex& index)
 {
 	ui.tokenLineEdit->setText(ui.tokensListView->model()->data(index).toString());
 }
+
diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp
index be8b515ff..ff302317d 100644
--- a/retroshare-gui/src/gui/settings/MessagePage.cpp
+++ b/retroshare-gui/src/gui/settings/MessagePage.cpp
@@ -18,8 +18,6 @@
  *                                                                             *
  *******************************************************************************/
 
-#include <QFontDatabase>
-
 #include "rshare.h"
 #include "rsharesettings.h"
 #include "retroshare/rsmsgs.h"
@@ -30,7 +28,6 @@
 #include <algorithm>
 #include "NewTag.h"
 #include "util/qtthreadsutils.h"
-#include "gui/notifyqt.h"
 
 MessagePage::MessagePage(QWidget * parent, Qt::WindowFlags flags)
     : ConfigPage(parent, flags)
@@ -51,20 +48,13 @@ MessagePage::MessagePage(QWidget * parent, Qt::WindowFlags flags)
 
     ui.openComboBox->addItem(tr("A new tab"), RshareSettings::MSG_OPEN_TAB);
     ui.openComboBox->addItem(tr("A new window"), RshareSettings::MSG_OPEN_WINDOW);
-
-    // Font size
-    QFontDatabase db;
-    foreach(int size, db.standardSizes()) {
-        ui.minimumFontSize->addItem(QString::number(size), size);
-    }
-
+    
     connect(ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(distantMsgsComboBoxChanged(int)));
 
 	connect(ui.setMsgToReadOnActivate,SIGNAL(toggled(bool)),          this,SLOT(updateMsgToReadOnActivate()));
 	connect(ui.loadEmbeddedImages,    SIGNAL(toggled(bool)),          this,SLOT(updateLoadEmbededImages()  ));
 	connect(ui.openComboBox,          SIGNAL(currentIndexChanged(int)),this,SLOT(updateMsgOpen()            ));
 	connect(ui.emoticonscheckBox,     SIGNAL(toggled(bool)),          this,SLOT(updateLoadEmoticons()  ));
-	connect(ui.minimumFontSize,       SIGNAL(activated(QString)),     this, SLOT(updateFontSize())) ;
 
     mTagEventHandlerId = 0;
     rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event) { RsQThreadUtils::postToObject( [this,event]() { handleEvent_main_thread(event); }); }, mTagEventHandlerId, RsEventType::MAIL_TAG );
@@ -126,11 +116,12 @@ void MessagePage::updateMsgTags()
 void
 MessagePage::load()
 {
+    Settings->beginGroup(QString("Messages"));
     whileBlocking(ui.setMsgToReadOnActivate)->setChecked(Settings->getMsgSetToReadOnActivate());
     whileBlocking(ui.loadEmbeddedImages)->setChecked(Settings->getMsgLoadEmbeddedImages());
     whileBlocking(ui.openComboBox)->setCurrentIndex(ui.openComboBox->findData(Settings->getMsgOpen()));
     whileBlocking(ui.emoticonscheckBox)->setChecked(Settings->value("Emoticons", true).toBool());
-	whileBlocking(ui.minimumFontSize)->setCurrentIndex(ui.minimumFontSize->findData(Settings->getMessageFontSize()));
+    Settings->endGroup();
 
 	  // state of filter combobox
     
@@ -307,9 +298,3 @@ void MessagePage::currentRowChangedTag(int row)
     ui.deletepushButton->setEnabled(bDeleteEnable);
 }
 
-void MessagePage::updateFontSize()
-{
-	Settings->setMessageFontSize(ui.minimumFontSize->currentData().toInt());
-
-	NotifyQt::getInstance()->notifySettingsChanged();
-}
diff --git a/retroshare-gui/src/gui/settings/MessagePage.h b/retroshare-gui/src/gui/settings/MessagePage.h
index c5b9f7544..774d31b95 100644
--- a/retroshare-gui/src/gui/settings/MessagePage.h
+++ b/retroshare-gui/src/gui/settings/MessagePage.h
@@ -60,7 +60,6 @@ private slots:
 	void updateDistantMsgs()             ;
 	void updateMsgTags()    ;
 	void updateLoadEmoticons();
-	void updateFontSize();
 
 private:
     void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
diff --git a/retroshare-gui/src/gui/settings/MessagePage.ui b/retroshare-gui/src/gui/settings/MessagePage.ui
index 3e5ab3842..fd55218e8 100644
--- a/retroshare-gui/src/gui/settings/MessagePage.ui
+++ b/retroshare-gui/src/gui/settings/MessagePage.ui
@@ -16,15 +16,44 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4">
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>Distant messages:</string>
      </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="2">
+       <widget class="RSComboBox" name="comboBox">
+        <item>
+         <property name="text">
+          <string>Everyone</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Contacts</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Nobody</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Accept encrypted distant messages from</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Reading</string>
      </property>
@@ -36,6 +65,20 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="openLabel">
+          <property name="text">
+           <string>Open messages in</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="RSComboBox" name="openComboBox"/>
+        </item>
+       </layout>
+      </item>
       <item row="1" column="0">
        <widget class="QCheckBox" name="loadEmbeddedImages">
         <property name="text">
@@ -50,24 +93,10 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="openLabel">
-          <property name="text">
-           <string>Open messages in</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="RSComboBox" name="openComboBox"/>
-        </item>
-       </layout>
-      </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Tags</string>
@@ -143,102 +172,6 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox_3">
-     <property name="title">
-      <string>Distant messages:</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3">
-      <item row="0" column="2">
-       <widget class="RSComboBox" name="comboBox">
-        <item>
-         <property name="text">
-          <string>Everyone</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Contacts</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Nobody</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Accept encrypted distant messages from</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QGroupBox" name="groupBox_4">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Fonts</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QHBoxLayout" name="minimumFontSizeHLayout">
-        <item>
-         <widget class="QLabel" name="minimumFontSizeLabel">
-          <property name="layoutDirection">
-           <enum>Qt::LeftToRight</enum>
-          </property>
-          <property name="text">
-           <string>Minimum font size </string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="RSComboBox" name="minimumFontSize">
-          <property name="font">
-           <font>
-            <family>MS Sans Serif</family>
-            <pointsize>10</pointsize>
-           </font>
-          </property>
-          <property name="focusPolicy">
-           <enum>Qt::ClickFocus</enum>
-          </property>
-          <property name="toolTip">
-           <string>Font size</string>
-          </property>
-          <property name="editable">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index be2404bc8..adb1d655c 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -228,7 +228,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
     connect(ui.hiddenpage_proxyPort_tor,    SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
     connect(ui.hiddenpage_proxyAddress_i2p, SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
     connect(ui.hiddenpage_proxyPort_i2p,    SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
-    connect(ui.hiddenpage_localPort,        SIGNAL(editingFinished()),this,SLOT(saveAddresses()));
 
     connect(ui.totalDownloadRate,SIGNAL(valueChanged(int)),this,SLOT(saveRates()));
     connect(ui.totalUploadRate,  SIGNAL(valueChanged(int)),this,SLOT(saveRates()));
@@ -1140,18 +1139,18 @@ void ServerPage::loadHiddenNode()
 	ui.iconlabel_ext->hide();
 	ui.textlabel_ext->hide();
 	ui.extPortLabel->hide();
-
+	
 	ui.ipAddressLabel->hide();
 	ui.cleanKnownIPs_PB->hide();
-
+	
 	ui.ipAddressList->hide();
 	ui.allowIpDeterminationCB->hide();
 	ui.IPServersLV->hide();
-
+	
     ui.textlabel_hiddenMode->show();
     ui.iconlabel_hiddenMode->show() ;
     ui.iconlabel_hiddenMode->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/images/ledon1.png"));
-
+    
     // CHANGE OPTIONS ON
     whileBlocking(ui.discComboBox)->removeItem(3);
     whileBlocking(ui.discComboBox)->removeItem(2);
@@ -1732,9 +1731,8 @@ void ServerPage::saveSam()
     new_proxyaddr = ui.hiddenpage_proxyAddress_i2p -> text().toStdString();
     new_proxyport = ui.hiddenpage_proxyPort_i2p -> value();
 
-    // SAMv3 has no proxy port, everything goes through the SAM port.
-    // Still need to check the proxyport for manual i2p
-    if ((new_proxyaddr != orig_proxyaddr) || (new_proxyport != orig_proxyport)) {
+	// SAMv3 has no proxy port, everything goes through the SAM port.
+	if ((new_proxyaddr != orig_proxyaddr) /* || (new_proxyport != orig_proxyport) */) {
         rsPeers->setProxyServer(RS_HIDDEN_TYPE_I2P, new_proxyaddr, new_proxyport);
     }
 }
diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index 5b3b49908..915eaa679 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -52,7 +52,7 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags)
     QObject::connect(ui._queueSize_SB,SIGNAL(valueChanged(int)),this,SLOT(updateQueueSize(int))) ;
     QObject::connect(ui._max_up_SB,SIGNAL(valueChanged(int)),this,SLOT(updateMaxUploadSlots(int))) ;
     QObject::connect(ui._defaultStrategy_CB,SIGNAL(activated(int)),this,SLOT(updateDefaultStrategy(int))) ;
-    //QObject::connect(ui._e2e_encryption_CB,SIGNAL(activated(int)),this,SLOT(updateEncryptionPolicy(int))) ;
+    QObject::connect(ui._e2e_encryption_CB,SIGNAL(activated(int)),this,SLOT(updateEncryptionPolicy(int))) ;
     QObject::connect(ui._diskSpaceLimit_SB,SIGNAL(valueChanged(int)),this,SLOT(updateDiskSizeLimit(int))) ;
     QObject::connect(ui._max_tr_up_per_sec_SB, SIGNAL( valueChanged( int ) ), this, SLOT( updateMaxTRUpRate(int) ) );
 	QObject::connect(ui._filePermDirectDL_CB,SIGNAL(activated(int)),this,SLOT(updateFilePermDirectDL(int)));
@@ -112,7 +112,6 @@ void TransferPage::updateMaxUploadSlots(int b)
     rsFiles->setMaxUploadSlotsPerFriend(b) ;
 }
 
-#ifdef TO_REMOVE
 void TransferPage::updateEncryptionPolicy(int b)
 {
     switch(b)
@@ -124,7 +123,6 @@ void TransferPage::updateEncryptionPolicy(int b)
         break ;
     }
 }
-#endif
 
 void TransferPage::updateFilePermDirectDL(int i)
 {
@@ -162,13 +160,11 @@ void TransferPage::load()
     case FileChunksInfo::CHUNK_STRATEGY_RANDOM: whileBlocking(ui._defaultStrategy_CB)->setCurrentIndex(2) ; break ;
     }
 
-#ifdef TO_REMOVE
     switch(rsFiles->defaultEncryptionPolicy())
     {
     case RS_FILE_CTRL_ENCRYPTION_POLICY_PERMISSIVE: whileBlocking(ui._e2e_encryption_CB)->setCurrentIndex(0) ; break ;
     case RS_FILE_CTRL_ENCRYPTION_POLICY_STRICT    : whileBlocking(ui._e2e_encryption_CB)->setCurrentIndex(1) ; break ;
     }
-#endif
 
     whileBlocking(ui._diskSpaceLimit_SB)->setValue(rsFiles->freeDiskSpaceLimit()) ;
     whileBlocking(ui._max_tr_up_per_sec_SB)->setValue(rsTurtle->getMaxTRForwardRate()) ;
@@ -208,11 +204,7 @@ void TransferPage::load()
 	whileBlocking(ui.suffixesIgnoreList_LE)->setText( ignore_suffixes_string );
 
 	Settings->beginGroup(QString("File"));
-#if defined(Q_OS_DARWIN)
-    whileBlocking(ui.minimumFontSize_SB)->setValue( Settings->value("MinimumFontSize", 13 ).toInt());
-#else
 	whileBlocking(ui.minimumFontSize_SB)->setValue( Settings->value("MinimumFontSize", 11 ).toInt());
-#endif
 	Settings->endGroup();
 }
 
diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h
index 077d5a6ec..a2a0a1061 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.h
+++ b/retroshare-gui/src/gui/settings/TransferPage.h
@@ -47,6 +47,7 @@ class TransferPage: public ConfigPage
 		void updateDefaultStrategy(int) ;
 		void updateDiskSizeLimit(int) ;
 		void updateMaxTRUpRate(int);
+		void updateEncryptionPolicy(int);
 		void updateMaxUploadSlots(int);
 		void updateFilePermDirectDL(int);
 		void updateIgnoreLists();
diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui
index 4b48be012..b6d8cd7ff 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.ui
+++ b/retroshare-gui/src/gui/settings/TransferPage.ui
@@ -14,7 +14,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -400,6 +400,13 @@ p, li { white-space: pre-wrap; }
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QLabel" name="_e2e_encryption_Label">
+                <property name="text">
+                 <string>End-to-end encryption:</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QLabel" name="_filePermDirectDL_Label">
                 <property name="text">
@@ -496,6 +503,23 @@ p, li { white-space: pre-wrap; }
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="RSComboBox" name="_e2e_encryption_CB">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anonymous tunnels can be end-o-end encrypted. In order to maintain backward compatibility, this can be made optional (choosing &amp;quot;Accepted&amp;quot;), but in the end, all Retroshare nodes will be switched to &amp;quot;Enforced&amp;quot;, meaning that all anonymous transfers will be end-to-end encrypted. With &amp;quot;Accepted&amp;quot;, it is likely that you will transfer using twice as many tunnels, since there is no way to know that an encrypted and a clear tunnel actually transfer from the same source.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <item>
+                 <property name="text">
+                  <string>Accepted</string>
+                 </property>
+                </item>
+                <item>
+                 <property name="text">
+                  <string>Enforced</string>
+                 </property>
+                </item>
+               </widget>
+              </item>
               <item>
                <widget class="RSComboBox" name="_filePermDirectDL_CB">
                 <property name="toolTip">
diff --git a/retroshare-gui/src/gui/settings/rsettingswin.cpp b/retroshare-gui/src/gui/settings/rsettingswin.cpp
index a9fab8895..1d3d4ecc3 100644
--- a/retroshare-gui/src/gui/settings/rsettingswin.cpp
+++ b/retroshare-gui/src/gui/settings/rsettingswin.cpp
@@ -93,8 +93,6 @@ SettingsPage::SettingsPage(QWidget *parent)
 
     connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(setNewPage(int)));
     connect(this, SIGNAL(finished(int)), this, SLOT(dialogFinished(int)));
-
-    mFontSizeHandler.registerFontSize(ui.listWidget);
 }
 
 SettingsPage::~SettingsPage()
diff --git a/retroshare-gui/src/gui/settings/rsettingswin.h b/retroshare-gui/src/gui/settings/rsettingswin.h
index 47eb33e4b..74fb0d40c 100755
--- a/retroshare-gui/src/gui/settings/rsettingswin.h
+++ b/retroshare-gui/src/gui/settings/rsettingswin.h
@@ -27,7 +27,6 @@
 #include <retroshare-gui/mainpage.h>
 
 #include "ui_settingsw.h"
-#include "util/FontSizeHandler.h"
 
 class FloatingHelpBrowser;
 
@@ -73,8 +72,6 @@ private:
 	FloatingHelpBrowser *mHelpBrowser;
 	static int lastPage;
 
-	FontSizeHandler mFontSizeHandler;
-
 	/* UI - from Designer */
 	Ui::Settings ui;
 };
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index d878d6c99..586d4df4f 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -109,7 +109,7 @@ void RshareSettings::initSettings()
 	setDefault(SETTING_STYLE, "GTK+");
 #else
 #if defined(Q_OS_MAC)
-	setDefault(SETTING_STYLE, "Fusion");
+	setDefault(SETTING_STYLE, "macintosh (aqua)");
 #else
 	static QStringList styles = QStyleFactory::keys();
 #if defined(Q_OS_WIN)
@@ -910,7 +910,7 @@ void RshareSettings::setUseLocalServer(bool value)
 {
 	if (value != getUseLocalServer()) {
 		setValue("UseLocalServer", value);
-		RsApplication::updateLocalServer();
+		Rshare::updateLocalServer();
 	}
 }
 
@@ -1190,38 +1190,6 @@ void RshareSettings::setPageAlreadyDisplayed(const QString& page_name,bool b)
 	return setValueToGroup("PageAlreadyDisplayed",page_name,b);
 }
 
-int RshareSettings::getFontSize()
-{
-#if defined(Q_OS_DARWIN)
-	int defaultFontSize = 13;
-#else
-	int defaultFontSize = 11;
-#endif
-
-	return value("FontSize", defaultFontSize).toInt();
-}
-
-void RshareSettings::setFontSize(int value)
-{
-	setValue("FontSize", value);
-}
-
-int RshareSettings::getMessageFontSize()
-{
-#if defined(Q_OS_DARWIN)
-	int defaultFontSize = 12;
-#else
-	int defaultFontSize = 11;
-#endif
-
-	return valueFromGroup("Message", "FontSize", defaultFontSize).toInt();
-}
-
-void RshareSettings::setMessageFontSize(int value)
-{
-	setValueToGroup("Message", "FontSize", value);
-}
-
 #ifdef RS_JSONAPI
 bool RshareSettings::getJsonApiEnabled()
 {
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h
index 317dedb56..362e52606 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.h
+++ b/retroshare-gui/src/gui/settings/rsharesettings.h
@@ -343,12 +343,6 @@ public:
     bool getPageAlreadyDisplayed(const QString& page_code) ;
     void setPageAlreadyDisplayed(const QString& page_code,bool b) ;
 
-    int getFontSize();
-    void setFontSize(int value);
-
-    int getMessageFontSize();
-    void setMessageFontSize(int value);
-
 #ifdef RS_JSONAPI
 	bool getJsonApiEnabled();
 	void setJsonApiEnabled(bool enabled);
diff --git a/retroshare-gui/src/gui/settings/settingsw.ui b/retroshare-gui/src/gui/settings/settingsw.ui
index 605e8558e..d1cbd3caf 100644
--- a/retroshare-gui/src/gui/settings/settingsw.ui
+++ b/retroshare-gui/src/gui/settings/settingsw.ui
@@ -35,6 +35,11 @@
         <height>16777215</height>
        </size>
       </property>
+      <property name="font">
+       <font>
+        <pointsize>11</pointsize>
+       </font>
+      </property>
       <property name="defaultDropAction">
        <enum>Qt::IgnoreAction</enum>
       </property>
@@ -95,6 +100,7 @@
            </property>
            <property name="font">
             <font>
+             <pointsize>12</pointsize>
              <weight>75</weight>
              <bold>true</bold>
             </font>
@@ -129,8 +135,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>1264</width>
-            <height>845</height>
+            <width>1313</width>
+            <height>849</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">
diff --git a/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp b/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp
index 684fdc69d..48b1462cc 100644
--- a/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp
+++ b/retroshare-gui/src/gui/statistics/StatisticsWindow.cpp
@@ -22,7 +22,6 @@
 #include "ui_StatisticsWindow.h"
 #include <QTimer>
 #include <QDateTime>
-#include <QActionGroup>
 
 #include <algorithm>
 #include <iostream>
diff --git a/retroshare-gui/src/lang/retroshare_bg.ts b/retroshare-gui/src/lang/retroshare_bg.ts
index c57ad6a7a..86615025a 100644
--- a/retroshare-gui/src/lang/retroshare_bg.ts
+++ b/retroshare-gui/src/lang/retroshare_bg.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Добави коментар</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -121,12 +128,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +143,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,6 +163,17 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Описание:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Качество:</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -184,6 +202,10 @@
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Описание:</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -540,7 +562,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,23 +588,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -625,7 +634,7 @@ p, li { white-space: pre-wrap; }
         <translation>Премахване на</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,7 +721,7 @@ p, li { white-space: pre-wrap; }
         <translation>Връщане</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -731,6 +740,14 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Запазване</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Отмяна</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
@@ -808,7 +825,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,12 +855,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -851,7 +868,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -871,7 +888,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -909,7 +926,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -929,7 +946,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -959,7 +976,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -969,7 +986,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Нов</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -977,12 +994,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1002,18 +1019,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Разширяване</translation>
     </message>
@@ -1028,12 +1045,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Премахни елемент</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1202,17 +1219,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1222,17 +1239,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1247,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1263,7 +1270,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1288,18 +1295,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Разширяване</translation>
     </message>
@@ -1314,7 +1321,7 @@ into the image, so as to
         <translation type="unfinished">Премахни елемент</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
@@ -1324,7 +1331,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Скрий</translation>
     </message>
@@ -1332,7 +1349,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
@@ -1523,7 +1540,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1556,14 +1573,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1571,13 +1587,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,7 +1603,29 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,7 +1635,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1654,12 +1692,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1669,42 +1707,23 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-564"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1714,22 +1733,27 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1744,47 +1768,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1799,7 +1823,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Показване</translation>
@@ -1819,7 +1843,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Премахни елемент</translation>
     </message>
@@ -1864,7 +1888,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1879,7 +1903,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1899,7 +1923,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1924,7 +1948,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1954,7 +1978,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1964,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +2012,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,22 +2082,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,17 +2097,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2190,7 +2194,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Чувствителност към регистъра</translation>
     </message>
@@ -2296,7 +2300,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2332,7 +2336,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2367,12 +2371,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,6 +2456,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2489,7 +2498,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2511,7 +2520,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2561,7 +2570,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2583,7 +2592,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2598,12 +2607,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2619,12 +2628,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2635,12 +2644,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2660,7 +2669,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,7 +2695,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2708,7 +2717,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2734,7 +2743,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2794,7 +2803,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2810,7 +2819,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2862,45 +2871,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2910,7 +2919,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2992,17 +3001,12 @@ Double click on it to add his name on text writer.</source>
         <translation>без</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3022,7 +3026,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3090,7 +3094,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3106,12 +3110,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
@@ -3121,17 +3125,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,7 +3145,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,22 +3170,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3201,27 +3195,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3267,17 +3266,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3297,12 +3296,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3310,7 +3309,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3350,7 +3349,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3375,7 +3374,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3385,7 +3384,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3424,7 +3423,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3434,7 +3433,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3459,7 +3458,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3472,7 +3471,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3507,7 +3506,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3517,7 +3516,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3582,7 +3586,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3610,7 +3614,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3620,20 +3624,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3643,14 +3644,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3660,8 +3659,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3686,7 +3684,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3978,7 +3976,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3986,8 +3984,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3997,7 +3994,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4033,12 +4030,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4058,7 +4055,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4078,18 +4075,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4104,7 +4101,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>Type</source>
+        <translation type="vanished">Тип</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Име:</translation>
     </message>
@@ -4144,19 +4145,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4166,24 +4167,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Добавяне</translation>
     </message>
@@ -4193,7 +4182,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4246,13 +4235,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,7 +4260,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4306,7 +4295,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4316,7 +4305,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4461,17 +4450,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4496,12 +4485,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4516,12 +4500,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +4545,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,16 +4555,7 @@ p, li { white-space: pre-wrap; }
         <translation>Форум</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+44"/>
+        <location line="+75"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4589,7 +4570,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+21"/>
+        <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 Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+93"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4604,7 +4594,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4634,17 +4624,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Заглавие</translation>
     </message>
@@ -4697,7 +4687,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4707,8 +4697,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4731,7 +4721,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4766,7 +4756,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4776,7 +4766,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4791,7 +4781,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4812,7 +4802,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4820,17 +4810,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,12 +4830,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4855,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4875,7 +4870,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,12 +4880,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4900,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4970,33 +4970,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5086,7 +5086,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5754,7 +5754,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5762,38 +5762,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5801,12 +5801,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5968,7 +5968,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5978,7 +5978,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6038,21 +6038,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6174,7 +6164,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6216,7 +6206,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6252,7 +6242,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6268,7 +6258,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6505,7 +6495,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6543,7 +6533,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6554,132 +6544,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Име</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Статус</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6762,38 +6636,33 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6811,17 +6680,7 @@ Also check your ports!</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6831,12 +6690,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6857,38 +6721,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6908,12 +6772,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6923,43 +6787,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7003,13 +6862,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7019,7 +6878,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7054,7 +6913,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7064,7 +6923,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7074,7 +6938,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7300,13 +7169,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7316,57 +7199,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7374,45 +7239,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7437,7 +7306,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7487,12 +7356,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7616,7 +7485,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7624,7 +7493,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7794,7 +7663,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Заглавие</translation>
     </message>
@@ -7807,12 +7676,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7837,7 +7706,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7852,14 +7721,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
@@ -7870,13 +7739,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7889,7 +7758,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8025,7 +7894,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8036,22 +7905,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8071,12 +7940,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8111,22 +7980,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8146,17 +8015,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8166,10 +8035,25 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Формуляр</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Заглавие</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Статус</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8207,18 +8091,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8233,7 +8107,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -8248,7 +8122,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8262,11 +8136,6 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8276,7 +8145,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8297,7 +8166,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8359,18 +8228,18 @@ p, li { white-space: pre-wrap; }
         <translation>Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8385,17 +8254,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8420,16 +8289,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Заглавие</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Търсене в заглавието</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Информационни канали</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Описание:</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8499,7 +8387,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8535,7 +8423,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8550,13 +8438,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Информационни канали</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8571,7 +8459,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8586,7 +8474,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8646,22 +8534,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8736,13 +8614,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8793,17 +8670,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8918,7 +8795,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8931,7 +8808,7 @@ p, li { white-space: pre-wrap; }
         <translation>Формуляр</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8961,7 +8838,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -9000,7 +8877,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9024,21 +8901,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9048,7 +8910,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9077,7 +8939,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9108,7 +8970,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9159,7 +9021,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9175,7 +9037,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -9194,11 +9056,6 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9228,13 +9085,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9245,7 +9102,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -9265,17 +9122,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
@@ -9288,66 +9145,59 @@ before you can comment</source>
         <translation>Формуляр</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Търсене Форуми</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Заглавие</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9357,7 +9207,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9397,23 +9252,23 @@ before you can comment</source>
         <translation>Търсене на автор</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Няма име</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9456,12 +9311,16 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Разширяване</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9491,8 +9350,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9506,6 +9365,10 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">без</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9575,12 +9438,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">Редактиране</translation>
     </message>
@@ -9641,7 +9504,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9661,7 +9524,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9713,7 +9576,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9723,7 +9586,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9738,7 +9601,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9804,12 +9667,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9844,12 +9707,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9860,12 +9723,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9873,7 +9736,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9933,7 +9796,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9956,7 +9819,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,12 +9835,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,23 +9857,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10026,28 +9889,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10057,12 +9914,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10072,7 +9929,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,12 +10004,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10168,22 +10020,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Автор</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10191,7 +10048,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10251,7 +10108,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10308,12 +10165,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10336,7 +10193,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10349,14 +10206,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10366,7 +10223,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10376,12 +10233,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,14 +10253,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10420,7 +10264,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10468,7 +10312,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10855,7 +10699,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10871,7 +10715,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10890,7 +10734,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10964,7 +10808,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Формуляр</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10974,7 +10818,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +10846,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11012,7 +10856,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11022,7 +10866,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11042,37 +10886,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11084,12 +10904,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11104,7 +10924,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11369,14 +11194,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11386,12 +11211,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11401,7 +11226,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11416,27 +11241,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11452,39 +11277,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11504,20 +11319,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11527,78 +11340,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11609,17 +11422,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11634,24 +11447,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11666,12 +11479,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11681,7 +11489,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11756,7 +11564,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11786,7 +11594,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">непознат</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11801,7 +11609,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11849,7 +11657,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11857,7 +11665,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11900,7 +11708,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11980,7 +11788,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11996,12 +11804,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12106,7 +11919,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12156,21 +11969,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12180,7 +11993,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12195,7 +12008,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12210,12 +12023,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12235,12 +12048,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12250,7 +12063,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12258,7 +12071,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12288,13 +12101,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12308,7 +12115,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12318,12 +12125,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12334,27 +12136,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12374,7 +12176,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12384,18 +12186,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12405,7 +12201,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12415,7 +12216,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,15 +12226,10 @@ These identities will soon be not supported anymore.</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Премахване на</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12459,7 +12255,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Добавяне</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,13 +12265,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12485,7 +12281,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12559,7 +12355,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Копиране</translation>
     </message>
@@ -12569,12 +12365,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Премахване на</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12597,34 +12393,18 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12642,32 +12422,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12688,12 +12463,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12702,31 +12472,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12736,7 +12501,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12764,7 +12529,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12780,8 +12545,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Настройки</translation>
     </message>
@@ -12802,7 +12566,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12813,12 +12577,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12843,12 +12607,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12859,35 +12622,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Помощ</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12902,12 +12661,7 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12937,7 +12691,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12957,7 +12711,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Показване</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13002,13 +12756,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13023,7 +12776,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13032,17 +12785,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13078,12 +12831,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13098,32 +12851,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13134,32 +12887,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13229,7 +12982,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13269,7 +13022,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13289,18 +13042,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13311,17 +13064,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13341,7 +13084,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13351,21 +13094,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13380,7 +13123,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13390,30 +13133,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Неизвестен</translation>
     </message>
@@ -13528,13 +13271,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13554,7 +13297,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13575,7 +13318,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13605,18 +13348,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>От:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13656,13 +13399,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13672,12 +13415,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13755,7 +13498,7 @@ Do you want to save message ?</source>
         <translation>По подразбиране</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13765,7 +13508,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13788,7 +13531,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13796,7 +13539,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13824,7 +13567,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13834,37 +13577,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>От:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>До:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13904,7 +13647,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13956,7 +13699,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13966,12 +13709,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13981,22 +13724,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14005,24 +13743,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14037,12 +13765,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14064,6 +13792,10 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Изтриване</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14142,7 +13874,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14152,16 +13884,20 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Delete</source>
+        <translation type="vanished">Изтриване</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14191,17 +13927,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14232,7 +13968,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14242,7 +13978,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
@@ -14252,7 +13988,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14261,16 +13997,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14297,12 +14023,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14378,7 +14104,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14392,7 +14118,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14407,28 +14133,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14463,17 +14179,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14527,7 +14233,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -14537,7 +14243,7 @@ Do you want to save message ?</source>
         <translation>Премахни елемент</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14572,7 +14278,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
@@ -14713,7 +14419,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14723,7 +14429,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14737,13 +14443,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14776,13 +14476,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14792,12 +14497,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14830,7 +14535,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14851,7 +14556,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14881,19 +14586,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14903,12 +14608,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14918,7 +14623,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15033,7 +14738,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15043,7 +14748,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15150,7 +14855,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15165,7 +14870,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15175,12 +14880,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15409,6 +15114,10 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Емисия</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15418,7 +15127,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15438,12 +15147,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15458,7 +15167,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Тест</translation>
     </message>
@@ -15469,19 +15178,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15489,7 +15196,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15628,12 +15335,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15678,7 +15380,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Настройки</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15724,21 +15431,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15756,7 +15463,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15832,12 +15539,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15863,7 +15570,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15884,7 +15591,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Премахни елемент</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
@@ -15924,7 +15631,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15982,7 +15689,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16149,6 +15856,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Формуляр</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16221,6 +15935,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Добави коментар</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16300,17 +16018,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16339,7 +16057,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16398,19 +16116,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16446,12 +16164,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16662,27 +16380,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16735,7 +16438,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Нов</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16755,8 +16458,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16781,13 +16484,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16815,12 +16518,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16835,22 +16538,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16866,17 +16559,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16886,7 +16569,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16906,22 +16589,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16936,7 +16609,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16947,7 +16620,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16957,7 +16630,7 @@ p, li { white-space: pre-wrap; }
         <translation>Заглавие</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16965,12 +16638,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17004,7 +16677,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17042,17 +16715,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17068,7 +16731,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -17083,17 +16746,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17106,18 +16764,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17128,12 +16786,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17143,7 +16801,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17153,17 +16811,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Задай като четене и премахване на елемент</translation>
     </message>
@@ -17173,7 +16831,7 @@ p, li { white-space: pre-wrap; }
         <translation>Нов</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17183,7 +16841,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
@@ -17224,11 +16882,34 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Формуляр</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Нов</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Следващ</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Предишна</translation>
+    </message>
+</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17247,17 +16928,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17267,15 +16938,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">непознат</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17285,42 +16956,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17340,7 +17011,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17370,17 +17041,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17395,17 +17066,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17415,31 +17081,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Редактиране</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17454,7 +17116,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17528,16 +17190,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17627,16 +17279,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17744,7 +17396,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17760,7 +17412,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17795,12 +17447,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17844,27 +17496,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17874,12 +17526,12 @@ and use the import button to load it</source>
         <translation type="unfinished">От:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17909,13 +17561,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17927,22 +17579,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17957,7 +17599,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17972,24 +17614,30 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished"></translation>
+        <source>Date</source>
+        <translation type="vanished">Дата</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18000,7 +17648,7 @@ and use the import button to load it</source>
         <translation type="unfinished">Формуляр</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18019,7 +17667,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18029,7 +17677,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18056,7 +17704,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18066,7 +17714,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18086,7 +17734,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18202,7 +17850,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18210,42 +17858,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18277,7 +17920,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18285,8 +17928,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18554,12 +18197,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18590,7 +18233,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18624,7 +18267,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18643,26 +18286,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18742,7 +18365,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18752,7 +18375,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18762,7 +18385,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18778,7 +18401,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18845,7 +18468,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18873,7 +18496,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19053,29 +18676,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Име</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Статус</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19318,18 +18925,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19469,7 +19064,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19636,7 +19231,7 @@ p, li { white-space: pre-wrap; }
         <translation>Формуляр</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19649,7 +19244,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19822,22 +19417,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19845,12 +19430,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20538,7 +20123,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Име</translation>
@@ -20659,7 +20244,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Име</translation>
     </message>
@@ -20679,7 +20264,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20735,7 +20320,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20749,6 +20334,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20762,11 +20352,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20789,17 +20374,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20823,9 +20403,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20846,7 +20424,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20907,7 +20485,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20928,7 +20506,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20958,7 +20536,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20976,7 +20554,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20993,12 +20571,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21059,7 +20637,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21074,7 +20652,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21174,23 +20752,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,7 +20778,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21237,7 +20815,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Папка</translation>
@@ -21248,17 +20826,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21278,7 +20856,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21286,7 +20864,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21302,22 +20880,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Премахни елемент</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21334,7 +20912,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Скрий</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21359,8 +20937,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21368,7 +20946,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21399,7 +20977,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Разширяване</translation>
     </message>
@@ -21444,12 +21022,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21469,12 +21047,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">Неизвестен</translation>
     </message>
@@ -21484,17 +21067,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
@@ -21504,7 +21077,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21514,12 +21087,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21578,12 +21151,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21604,22 +21177,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21632,16 +21205,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21651,46 +21229,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21700,7 +21255,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21725,95 +21280,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21828,7 +21325,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished">непознат</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21838,7 +21399,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21850,12 +21426,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21865,7 +21441,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21880,23 +21456,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21907,7 +21483,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21917,7 +21503,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21927,7 +21518,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21967,7 +21568,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21982,7 +21583,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22018,32 +21624,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22098,7 +21679,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22123,7 +21704,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22135,7 +21716,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22158,7 +21739,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
@@ -22218,28 +21799,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22255,18 +21825,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22301,12 +21871,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22329,22 +21899,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22379,7 +21949,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22389,12 +21959,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22474,7 +22044,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22484,12 +22054,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22508,7 +22078,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22528,17 +22098,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">Отмяна</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22548,7 +22118,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Премахване на</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22639,7 +22209,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22647,7 +22217,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22698,16 +22268,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22717,7 +22282,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22732,7 +22297,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22748,7 +22313,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22773,7 +22338,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22916,12 +22481,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22945,7 +22510,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23284,7 +22849,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23521,7 +23086,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23557,15 +23122,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished">Неизвестен</translation>
     </message>
@@ -23575,13 +23137,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23591,57 +23158,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23649,7 +23171,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23659,7 +23181,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23670,12 +23192,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23703,7 +23224,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23714,7 +23235,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23724,27 +23245,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23829,7 +23345,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23838,12 +23354,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23868,12 +23379,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23938,7 +23444,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23948,17 +23459,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23986,7 +23487,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24014,19 +23515,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Име</translation>
@@ -24233,12 +23734,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24263,7 +23759,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24284,7 +23780,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24317,17 +23813,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24342,7 +23828,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24469,18 +23955,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Пътека</translation>
     </message>
@@ -24490,7 +23981,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24500,7 +23991,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24515,7 +24006,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24525,7 +24016,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24939,17 +24430,12 @@ p, li { white-space: pre-wrap; }
         <translation>Формуляр</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24989,27 +24475,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25019,12 +24495,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25161,7 +24637,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25176,7 +24652,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25264,7 +24740,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25299,7 +24775,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25329,18 +24805,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
@@ -25361,7 +24833,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25444,7 +24916,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25459,7 +24940,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25479,7 +24960,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25509,7 +24990,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>New</source>
+        <translation type="vanished">Нов</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25519,7 +25004,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25582,42 +25067,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Формуляр</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Премахване на</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25662,41 +25140,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Неизвестен</translation>
@@ -25774,7 +25222,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25811,7 +25259,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_ca_ES.ts b/retroshare-gui/src/lang/retroshare_ca_ES.ts
index 1e88b2136..fe57c6488 100644
--- a/retroshare-gui/src/lang/retroshare_ca_ES.ts
+++ b/retroshare-gui/src/lang/retroshare_ca_ES.ts
@@ -84,6 +84,13 @@
         <translation>Només node ocult</translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Afegir comentari</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -121,12 +128,12 @@
         <translation>RetroShare: Cerca Avançada</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Criteris de Cerca</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Afegeix un altre criteri de cerca.</translation>
     </message>
@@ -136,7 +143,7 @@
         <translation>Reinicialitzar els criteris de cerca.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Cancel·la la cerca.</translation>
     </message>
@@ -156,6 +163,177 @@
         <translation>Cerca</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Crear àlbum</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Nom d&apos;àlbum:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Categoria:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Animals</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Família</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Amics</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Flors</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Vacances</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Paisatges</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Mascotes</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Retrats</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Viatges</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Treball</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Aleatori</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Llegenda:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">On:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotògraf:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descripció:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Opcions de compartició:</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Política:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Qualitat:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Comentari:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Identitat:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Públic</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Restringit</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Redimensionar imatges (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Redimensionar imatges (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Enviar imatges originals</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">No es permeten els comentaris</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Comentaris autenticats</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Qualsevol comentari permès</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Publicar amb identitat</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Arrosegar i deixar per inserir imatges. Clica en una imatge per editar-ne els detalls a sota.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Enrere</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Afegir fotos.</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Publicar àlbum</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Àlbum sense títol</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Digues alguna cosa sobre aquest àlbum...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">On ha anat a parar això?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Carrega la miniatura de l&apos;àlbum</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -164,11 +342,19 @@
         <source>Album</source>
         <translation>Àlbum</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Miniatura de l&apos;àlbum</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>EtiquetaTexte</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Resum</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -184,6 +370,34 @@
         <source>Caption</source>
         <translation>Llegenda</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">On:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Quan</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descripció:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Opcions de compartició:</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Comentaris</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Publicar identitat</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Visibilitat</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -552,7 +766,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Avís: Els serveis aquí esmentat són experimentals. Si us plau, ajuda&apos;ns a testejar-los. 
@@ -568,6 +782,14 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">FòrumsGxs</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">CanalsGxs</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -579,23 +801,10 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation>Fotos</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">Desar imatge</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p kb</translation>
     </message>
@@ -632,13 +841,17 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Afegir avatar</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Treure</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Tria la fotografia del teu avatar</translation>
     </message>
@@ -657,6 +870,10 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Carrega avatar</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -725,10 +942,22 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation>Restablir</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Taxa de Recepció</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Taxa d&apos;enviament</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Sempre per damunt</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Estil</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -744,11 +973,23 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <source>% Opaque</source>
         <translation>% Opac</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Desa</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Cancel·la</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Des de:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Amagar opcions</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -821,7 +1062,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Comentari</translation>
     </message>
@@ -851,12 +1092,12 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L&apos;autor d&apos;aquest missatge (amb Id %1) està expulsat.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -864,7 +1105,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positiu</translation>
     </message>
@@ -884,7 +1125,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +1163,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positiu</translation>
     </message>
@@ -942,7 +1183,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -972,7 +1213,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Compartir</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Canvia l&apos;estat dels missatges llegits</translation>
     </message>
@@ -982,7 +1223,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Nou</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -990,12 +1231,12 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">M&apos;agrada</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1015,18 +1256,18 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Ampliar</translation>
     </message>
@@ -1041,12 +1282,12 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished">Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1215,17 +1456,17 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Canals</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Pestanyes</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>General</translation>
     </message>
@@ -1235,17 +1476,11 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Descarregues</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Carrega les entrades en segon pla (Utilitza fils)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Obrir cada canal en una nova pestanya</translation>
     </message>
@@ -1253,7 +1488,7 @@ Però recorda: Totes les dades generades aquí *SERAN* perdudes quan actualitzem
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1276,7 +1511,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">M&apos;agrada</translation>
     </message>
@@ -1301,18 +1536,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Ampliar</translation>
     </message>
@@ -1327,7 +1562,7 @@ into the image, so as to
         <translation type="unfinished">Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -1337,7 +1572,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Comentari</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished">Comentaris</translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Amagar</translation>
     </message>
@@ -1345,7 +1590,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -1536,7 +1781,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Mostra el xat de sala</translation>
     </message>
@@ -1548,6 +1793,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>Xats</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Tens %1 nous missatges</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Tens %1 nou missatge</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 missatges nous</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 missatges nous</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1569,14 +1830,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Sala desconeguda</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Suprimeix-ho tot</translation>
     </message>
@@ -1584,13 +1844,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Comte</translation>
     </message>
@@ -1600,7 +1860,33 @@ into the image, so as to
         <translation>Tema</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>Sales de xat privades subscrites</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>Sales de xat públiques subscrites</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Sales de xat privades</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Sales de xat públiques</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">                             &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Sales de xat&lt;/h1&gt;	 &lt;p&gt;Les sales de xat són sales distribuïdes que funcionen molt semblant a les de IRC. 	Et permeten parlar anònimament amb moltíssima gent sense haver-los de fer amics.&lt;/p&gt; 	 &lt;p&gt;Una sala de xat pot ser pública (els teus amics la veuen ) o privades (els teus amics no poden veure-la si no els invites amb &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	Un cop has sigut invitat a una sala privada podràs veure quan els teus amics 	 la estan usant.&lt;/p&gt; 	 &lt;p&gt;La llista de l&apos;esquerra mostra 	 sales de xat en que participen els teus amics. Pots o bé		 &lt;ul&gt;			 &lt;li&gt;Fer clic dret per crear una sala de xat nova&lt;/li&gt; 		 &lt;li&gt;Fer doble clic per entrar a una sala, xatejar, i que els teus amics ho vegin&lt;/li&gt;	 &lt;/ul&gt; 	 Nota: Per a que les sales de xat funcionin correctament el teu ordinador a d&apos;anar a l&apos;hora. Comprova-ho!	 &lt;/p&gt; </translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Crear sala de xat</translation>
     </message>
@@ -1610,7 +1896,7 @@ into the image, so as to
         <translation>Abandonar sala</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Crear una identitat no anònima i entrar a aquesta sala</translation>
     </message>
@@ -1669,12 +1955,12 @@ Selecciona entre les sales de la esquerra per mostrar-ne els detalls.
 Fes doble clic a les sales per entrar-hi i xatejar.</translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 t&apos;invita a una sala de xat anomenada %2</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Escull una identitat no anònima per aquesta sala:</translation>
     </message>
@@ -1684,31 +1970,31 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Escull una identitat per aquesta sala:</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Crear sala de xat</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[No s&apos;ha proporcionat cap assumpte]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Informació de la sala seleccionada</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Privat</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Públic</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>IDs anònimes acceptades</translation>
     </message>
@@ -1718,25 +2004,42 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Eliminar auto-subscripció</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Afegir auto-subscripció</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Cercar sales de xat</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Cercar nom</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Subscrit</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Columnes</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">No</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1748,47 +2051,47 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Nom de la sala de xat:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>Id de la sala de xat:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Tema:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Tipus:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Seguretat:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Contactes:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>EtiquetaText</translation>
     </message>
@@ -1803,24 +2106,13 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Ids anònims prohibits</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>columna</translation>
@@ -1834,7 +2126,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Eliminar l&apos;element</translation>
     </message>
@@ -1879,22 +2171,46 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>General</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Xat distant</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Tothom</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Contactes</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Ningú</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Acceptar xats distants encriptats de </translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Configuració xat</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Activa les emoticones al xat privat</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Activa emoticones pels xats en grup</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Activa tipus de lletra personalitzats</translation>
     </message>
@@ -1903,6 +2219,10 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Enable custom font size</source>
         <translation>Activa mida de lletra personalitzat</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Mida de lletra mínima</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1914,7 +2234,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Activa cursiva</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1939,7 +2259,11 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Carrega imatges incrustades</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Sala de xat</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Icona de pestanya parpellejant</translation>
     </message>
@@ -1948,6 +2272,10 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Do not send typing notifications</source>
         <translation>No enviar avís d&apos;estar escribint</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Xat privat</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1969,7 +2297,11 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Icona de pestanya/finestra parpellejant</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Tipus de lletra pel xat</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Canviar tipografia pel xat</translation>
     </message>
@@ -1979,10 +2311,14 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Tipus de lletra pel xat:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Històric</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Estil</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1997,13 +2333,17 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Variant:</source>
         <translation>Variant:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Xat en grup</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Xat privat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation>Escull una tipografia pel Xat.</translation>
     </message>
@@ -2067,28 +2407,22 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;En aquesta pestanya pots modificar quants missatges de xat el RetroShare mantindrà emmagatzemats en disc i quantes de les converses prèvies mostrarà pels diferents sistemes de xat. El període màxim d&apos;emmagatzematge et permet descartar missatges vells i impedeix que l&apos;historial de xat s&apos;ompli amb xats esporàdics (per ex. sales de xat i xats distants).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Salesxat</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Activat:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2098,17 +2432,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Sales de xat</translation>
@@ -2205,7 +2529,11 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Període màxim d&apos;emmagatzemat, en dies (0=Il·limitat):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Cerca per defecte</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Diferenciar majúscules/minúscules</translation>
     </message>
@@ -2244,6 +2572,10 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Threshold for automatic search</source>
         <translation>Límit per fer una cerca automàtica</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Identitat per defecte per les sales de xat:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2311,7 +2643,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Mostra xat</translation>
     </message>
@@ -2347,7 +2679,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Tancar</translation>
     </message>
@@ -2382,12 +2714,12 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>Insertar emoticona</translation>
     </message>
@@ -2396,6 +2728,10 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Attach a Picture</source>
         <translation>Adjunta una imatge</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:desactivat {&lt;/p&gt;&lt;p&gt;	imatge: url(:/icons/png/send-message-blocked.png) ;}&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2467,6 +2803,11 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <source>Insert horizontal rule</source>
         <translation>Inserir regla horitzontal</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Desar imatge</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2504,7 +2845,7 @@ Fes doble clic a les sales per entrar-hi i xatejar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>està escrivint...</translation>
     </message>
@@ -2528,7 +2869,7 @@ després de convertir a HTML.</translation>
         <translation>Escull el tipus de lletra</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Segur que vols eliminar físicament l&apos;historial?</translation>
     </message>
@@ -2578,7 +2919,7 @@ després de convertir a HTML.</translation>
         <translation>està ocupat i pot no respondre</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Cercar diferenciant majúscules i minúscules</translation>
     </message>
@@ -2600,7 +2941,7 @@ després de convertir a HTML.</translation>
         <translation>No deixis de colorejar fins trobar X elements (Necessita més UCP)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Trobar anterior &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2615,12 +2956,16 @@ després de convertir a HTML.</translation>
         <translation>&lt;b&gt;Trobar &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Estat)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Estableix tipus de lletra i color</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Adjunta un arxiu</translation>
     </message>
@@ -2636,12 +2981,12 @@ després de convertir a HTML.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Marca el text seleccionat&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation>Id de la persona:</translation>
     </message>
@@ -2653,12 +2998,12 @@ Double click on it to add his name on text writer.</source>
 Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation>No signat</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>Elements trobats.</translation>
     </message>
@@ -2678,7 +3023,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Escriu un missatge aquí</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>No t&apos;aturis a colorejar després de</translation>
     </message>
@@ -2704,7 +3049,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Mostrant detalls:</translation>
     </message>
@@ -2726,7 +3071,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Cercles personals</translation>
     </message>
@@ -2752,7 +3097,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Amics</translation>
     </message>
@@ -2812,7 +3157,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Amics dels amics</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Cercles externs (Admin)</translation>
     </message>
@@ -2828,7 +3173,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
@@ -2880,48 +3225,43 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: no es poden obtenir detalls del contacte.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2933,7 +3273,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Encriptació</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>No connectat</translation>
     </message>
@@ -3015,17 +3355,25 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>cap</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Aquest certificat conté:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;un&lt;b&gt;ID de node&lt;/b&gt; i &lt;b&gt;nom&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">una &lt;b&gt;adreça onion&lt;/b&gt; i &lt;b&gt;port&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">una &lt;b&gt;adreça IP&lt;/b&gt; i &lt;b&gt;port&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Pots utilitzar aquest certificat per fer nous amics. Envia&apos;l per correu o entrega&apos;l en ma.&lt;/p&gt;</translation>
     </message>
@@ -3040,7 +3388,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquest és el mètode d&apos;encriptat utilitzat per &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. La conexió cap a nodes amics&lt;/p&gt;&lt;p&gt;és sempre forta i si hi ha DHE disponible la conexió a més a més utilitza&lt;/p&gt;&lt;p&gt;&amp;quot;perfect forward secrecy&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>amb</translation>
     </message>
@@ -3057,16 +3405,118 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <source>Connect Friend Wizard</source>
         <translation>Auxiliar de connexió amb amic</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Afegir un nou amic</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;El teu amic et proporciona un arxiu de certificat</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;Fes-te amic dels amics seleccionats dels teus amics</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Email 
+ (Your friend will receive an email with instructions how to download RetroShare)</source>
+        <translation type="vanished">&amp;Envia una invitació per correu electrònic 
+(El teu amic rebrà un correu electrònic amb instruccions sobre com descarregar el RetroShare)</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Inclou les signatures</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Copiar el teu certificat al porta-retalls</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Desar el teu certificar en un arxiu</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Executa el programa de correu electrònic</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Obre el certificat d&apos;un amic des d&apos;un arxiu</translation>
     </message>
+    <message>
+        <source>Open certificate</source>
+        <translation type="vanished">Obre un certificat</translation>
+    </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">Si us plau, enganxa el certificat de Retroshare dels teus amics a la caixa inferior</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Arxiu de certificat</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Utilitza certificats PGP desat en arxius.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Importa certificats d&apos;amics...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Has de generar un arxiu amb el teu certificat i donar-lo al teu amic. També pots utilitzar un arxiu generat anteriorment.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Exportar el meu certificat...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Arrossega i deixa el certificat dels teus amics a aquesta finestra o especifica una ubicació a la part inferior</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Navegar</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Amics d&apos;amics</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Selecciona amb qui et vols fer amic ara.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Mostra-m&apos;ho:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Fer-se amic amb aquests contactes</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>ID RetroShare</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Utilitza la Id de RetroShare per afegir un amic que es troba disponible a la xarxa.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Afegir amics utilitzant la Id de RetroShare...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Enganxar Id de RetroShare de l&apos;amic a la casella inferior</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Introdueix el Id de RetroShare del teu amic, ex. Contacte@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3108,7 +3558,27 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Correu electrònic</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Convidar amics per correu electrònic</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Introdueix l&apos;adreça de correu electrònic dels teus amics (Separa-les amb un punt i coma)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">L&apos;adreça de correu electrònic dels teus amics:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Introdueix les adreces de correu electrònic dels teus amics</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Assumpte:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3124,32 +3594,77 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Detalls sobre la petició</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Detalls del contacte</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Correu electrònic:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Node:</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">Si us plau, tingues en compte que RetroShare necessitarà una quantitat excessiva d&apos;ample de banda, memòria i CPU si afegeixes masses amics. Pots afegir tants amics com vulguis, però més de 40 serà probablement excessiu.</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Ubicació:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Opcions</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">Aquest assistent t&apos;ajudarà a connectar amb el(s) teu(s) amic(s) de la xarxa RetroShare.&lt;br&gt;Escull com t&apos;agradaria afegir un amic:</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Introdueix el certificat manualment</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">Introdueix la  Id de RetroShare manualment</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">&amp;Envia una Invitació utilitzant web mail</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Recomanar molts amics els uns als altres</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">Certificat Retroshare</translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">Si us plau, enganxa el certificat de Retroshare del teu amic aquí sota</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Enganxar certificat</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquesta casella espera el certificat de Retroshare del teu amic. AVÍS: No és el mateix que la clau del perfil del teu amic. No enganxis la clau del perfil del teu amic aquí (Ni tan sols part d&apos;ella). No funcionarà.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Afegir amic al grup:</translation>
     </message>
@@ -3159,7 +3674,7 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Autentica amic (Signa clau PGP)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3184,22 +3699,16 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Afegir com amic amb qui connectar</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Per acceptar la petició de l&apos;amic, clica al botó acabar.</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Ho sentim, ha aparegut algun error</translation>
     </message>
@@ -3219,27 +3728,32 @@ Doble clic per afegir el seu nom al text escrit.</translation>
         <translation>Detalls sobre el teu amic:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Validesa de la clau:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Signants</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signar la clau d&apos;un amic és una forma d&apos;expressar la teva confiança en aquest amic als teus altres amics. Les signatures a sota testimonien criptogràficament que els propietaris de les claus llistades reconeixen la clau PGP com autèntica. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Aquest contacte ja és a la llista d&apos;amics. Afegir-lo potser només actualitzi la seva adreça IP.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3285,17 +3799,49 @@ Doble clic per afegir el seu nom al text escrit.</translation>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Càrrega de certificat fallida</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">No es poden aconseguir els detalls del contacte de la clau PGP %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Qualsevol contacte que no he signat</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Amics dels meus amics que ja confien en mi</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Contactes signats mostrats com denegats</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Nom del contacte</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">També signat per</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Id contacte</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">El certificat sembla vàlid</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>No és un certificat de Retroshare vàlid!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Invitació al RetroShare</translation>
     </message>
@@ -3317,12 +3863,12 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Aquest és el teu certificat! No vols fer-te amic amb tu mateix, oi?</translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3330,7 +3876,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation>Aquesta clau ja és a la teva llista de confiança</translation>
     </message>
@@ -3370,7 +3916,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>Tens una petició d&apos;amic de</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3395,7 +3941,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3405,7 +3951,47 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Carrega de certificat fallada: No es troba l&apos;arxiu %1</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">El contacte %1 no està disponible a la teva xarxa</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Utilitza el format nou de certificat (més robust i segur)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Utilitza el format de certificat antic (Compatible amb versions anteriors)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Elimina signatures</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">Invita al RetroShare</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Ajuda de connectar amic</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Pots copiar aquest text i enviar-lo al teu amic per correu electrònic a un altre mètode</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">S&apos;ha copiat el teu certificat al porta-retalls, enganxa&apos;l i envia&apos;l al teu amic per correu </translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Desa com...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3444,7 +4030,11 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>*** Cap ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Utilitza com a font directa quan estigui disponible</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>Adreça IP:</translation>
     </message>
@@ -3454,7 +4044,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>Adreça IP:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Mostrar opcions avançades</translation>
     </message>
@@ -3463,6 +4053,10 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signar la clau d&apos;un amic és una forma d&apos;expressar la teva confiança en aquest amic als teus altres amics. Els ajudarà a decidir si volen acceptar o no connexions d&apos;aquesta clau basant-se en la teva confiança. Signar una clau és completament opcional i no es pot desfer, fes-ho amb cura.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;El Retroshare periòdicament comprova la teva llista d&apos;amics per arxius navegables que coincideixin amb els mateixos que estàs descarregant, per establir una transferència directa. En aquest cas els teus amics sabran què descarregues.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Si no vols que això passi per algun amic en concret, desmarca aquesta casella. Encara podràs realitzar transferències directes si ho demanes explícitament, per exemple descarregant de la llista del teu amic directament. Això s&apos;aplicarà a totes les ubicacions del mateix node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3473,13 +4067,45 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Els contactes que tenen aquesta opció no poden connectar-se si la seva adreça no és a la llista blanca. Això et protegeix d&apos;atacs de reenviament. Quan s&apos;usen, els contactes refusats són notificats a la secció de Novetats amb un tiquet de seguretat. Des d&apos;allí es pot decidir que fer amb la IP. S&apos;aplica a totes les ubicacions del mateix node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Recomanar molts amics els uns als altres</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Recomanacions de l&apos;amic</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">El text a sota és el teu certificat de Retroshare. L&apos;has de proporcionar al teu amic</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Missatge:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Recomanar amics</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">A</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Si us plau, escull almenys un amic per recomanació.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Si us plau, selecciona almenys un amic com a destinatari.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Afegeix clau al clauer</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Aquesta claus ja és al clauer</translation>
     </message>
@@ -3495,7 +4121,7 @@ missatges distants a aquest contacte
 encara que no sigueu amics.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>El certificat té un nombre de versió erroni. Recorda que les xarxes v0.6 i v0.5 són incompatibles.</translation>
     </message>
@@ -3530,7 +4156,7 @@ encara que no sigueu amics.</translation>
         <translation>Afegir la IP a la llista blanca</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>Aquest certificat no té IP!</translation>
     </message>
@@ -3540,10 +4166,27 @@ encara que no sigueu amics.</translation>
         <translation>&lt;p&gt;Aquest certificat no té IP. Només podràs utilitzar descobriment i DHT per trobar-lo. Com que és necessari que estigui a la llista blanca d&apos;IPs el contacte provocarà un avís a la pestanya de Novetats. Des d&apos;allí podràs afegir la IP a la llista blanca.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished">[Desconegut]</translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Afegit amb el certificat de %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Enganxa el certificat del teu amic des del porta-retalls</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Carrega de certificat fallada: no es pot llegir de l&apos;arxiu %1</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Carrega de certificat fallada: Hi ha alguna cosa malament amb %1</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3605,7 +4248,7 @@ encara que no sigueu amics.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>Configuració UDP</translation>
     </message>
@@ -3641,7 +4284,7 @@ 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;Lucida Grande&apos;; font-size:13pt;&quot;&gt;pots tancar-lo.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Auxiliar de connexió</translation>
     </message>
@@ -3651,20 +4294,17 @@ p, li { white-space: pre-wrap; }
         <translation>Id contacte invàlida</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Estat desconegut</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Fora de línia</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Darrera NAT simètric</translation>
     </message>
@@ -3674,14 +4314,12 @@ p, li { white-space: pre-wrap; }
         <translation>Darrera NAT i sense DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Reiniciar xarxa</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>Darrera NAT</translation>
     </message>
@@ -3691,8 +4329,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sense DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>ESTAT DE LA XARXA BO!</translation>
     </message>
@@ -3717,7 +4354,7 @@ p, li { white-space: pre-wrap; }
         <translation>Trobant contactes RS</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Descobriment requereix DHT</translation>
     </message>
@@ -4009,7 +4646,7 @@ p, li { white-space: pre-wrap; }
         <translation>Si us plau, intenta-ho important un certificat complet</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4017,8 +4654,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>REENVIAMENT NO VERIFICABLE!</translation>
     </message>
@@ -4028,7 +4664,7 @@ p, li { white-space: pre-wrap; }
         <translation>REENVIAMENT NO VERIFICABLE I SENSE DHT</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Cercant</translation>
     </message>
@@ -4064,12 +4700,12 @@ p, li { white-space: pre-wrap; }
         <translation>Detalls del cercle</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nom del cercle, contacte de l&apos;autor i la llista de membres invitats serà visible a tots els membres invitats. Si el cercle no és privat, també serà visible pels nodes veïns dels nodes que pertanyen als membres invitats.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4089,7 +4725,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>Ids</translation>
     </message>
@@ -4109,18 +4745,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtre</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Sobrenom</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Membres convidats</translation>
     </message>
@@ -4135,7 +4771,15 @@ p, li { white-space: pre-wrap; }
         <translation>Gent Coneguda</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Tipus</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
@@ -4175,19 +4819,23 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Els cercles poden restringir-se a membres d&apos;un altre cercle. Només els membres d&apos;aquest segon cercle podran veure el nou cercle i el contingut (llistat de membres, etc.).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Només visible a membres de:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Si us plau, introdueix un nom pel teu cercle</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>No s&apos;ha seleccionat cap cercle de restricció</translation>
     </message>
@@ -4197,24 +4845,12 @@ p, li { white-space: pre-wrap; }
         <translation>No s&apos;ha seleccionat cap cercle de limitacions</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Desconegut]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Afegir</translation>
     </message>
@@ -4224,7 +4860,7 @@ p, li { white-space: pre-wrap; }
         <translation>Treure</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Cercar</translation>
@@ -4239,6 +4875,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Signat</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Signat per nodes coneguts</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4255,6 +4895,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>Identitat PGP</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Id anonima</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4277,13 +4921,17 @@ p, li { white-space: pre-wrap; }
         <translation>Crear Nou Cercle</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">Id enllaç PGP</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Afegir Membre</translation>
     </message>
@@ -4302,7 +4950,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crear grup</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Nom del grup:</translation>
     </message>
@@ -4337,7 +4985,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Nova entrada al canal</translation>
     </message>
@@ -4347,7 +4995,7 @@ p, li { white-space: pre-wrap; }
         <translation>Entrada al canal</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4408,11 +5056,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Fes arrossegar i deixar / Botó d&apos;afegir arxius per calcular el número de hash d&apos;arxius nous.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copiar/Enganxar enllaços RetroShare dels teus compartits&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Afegir arxiu per adjuntar</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Afegir miniatura del canal</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Missatge</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Assumpte:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4498,17 +5158,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4527,18 +5187,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Arxiu ja afegit i hash calculat</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Si us plau, afegeix un assumpte</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Carrega miniatura</translation>
     </message>
@@ -4553,12 +5212,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Generar dades en massa</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Segur que vols generar %1 missatges?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Estàs a punt d&apos;afegir arxius que ara mateix no comparteixes. Segur que ho vols fer?</translation>
     </message>
@@ -4592,7 +5257,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Publica missatge al fòrum</translation>
     </message>
@@ -4601,6 +5266,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Fòrum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Assumpte</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4621,8 +5290,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4641,7 +5310,7 @@ p, li { white-space: pre-wrap; }
         <translation>Podeu adjuntar arxius arrossegant i deixant anar en aquesta finestra</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4671,17 +5340,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Sense fòrum</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>En resposta a</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Títol</translation>
     </message>
@@ -4735,7 +5404,7 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished">Carrega arxiu d&apos;imatge</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>No hi ha un ID compatible amb aquest fòrum</translation>
     </message>
@@ -4745,8 +5414,8 @@ Vols descartar aquest missatge?</translation>
         <translation>Cap de les teves identitats té permès publicar en aquest fòrum. Això pot deures a que el fòrum estigui limitat a un cercle que no té cap de les teves identitats, o a que el fòrum requereixi una identitat signada amb PGP.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Generar dades en massa</translation>
     </message>
@@ -4755,6 +5424,10 @@ Vols descartar aquest missatge?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Segur que vols generar %1 missatges?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Enviar</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4769,7 +5442,23 @@ Vols descartar aquest missatge?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Crear sala de xat</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Un sala de xat és un grup de xat descentralitzat i anònim. Tots els participants reben tots els missatges. Un cop la sala és creada pots invitar altres amics de la pestanya d&apos;amics.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Nom de la sala:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Assumpte de la sala:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4804,7 +5493,7 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
@@ -4814,7 +5503,11 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si marques aquí només ids signades amb PGP podran ser utilitzades per accedir i parlar a la sala. Aquesta limitació evita l&apos;spam anònim donat que esdevé possible que, com a mínim algunes de les persones de la sala, puguin localitzar el node de l&apos;spammer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>requereix identitats signades amb PGP</translation>
     </message>
@@ -4829,7 +5522,11 @@ Vols descartar aquest missatge?</translation>
         <translation>Escull els amics amb qui vols fer un xat en grup.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Amics convidats</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Crear sala de xat</translation>
@@ -4850,7 +5547,7 @@ Vols descartar aquest missatge?</translation>
         <translation>Contactes:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Identitat a utilitzar:</translation>
     </message>
@@ -4858,17 +5555,17 @@ Vols descartar aquest missatge?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Informació pública</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Ubicació:</translation>
     </message>
@@ -4878,12 +5575,12 @@ Vols descartar aquest missatge?</translation>
         <translation>Id d&apos;ubicació:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Versió de programari:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>En línia des de:</translation>
     </message>
@@ -4903,7 +5600,12 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4913,7 +5615,7 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Altra informació</translation>
     </message>
@@ -4923,12 +5625,17 @@ Vols descartar aquest missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished">Perfil</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Certificat</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4938,7 +5645,11 @@ Vols descartar aquest missatge?</translation>
         <translation>Inclou les signatures</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Desa la clau a un arxiu</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exportar identitat</translation>
     </message>
@@ -5011,33 +5722,33 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>EtiquetaText</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>fingerprint PGP:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Informació de node</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>Id PGP:</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Nodes de l&apos;amic:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5076,6 +5787,14 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>Node</source>
         <translation>Node</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Crear node nou...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">mostra la finestra d&apos;estadístiques</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5092,6 +5811,10 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Retroshare utilitza el DHT de Bittorrent com a repetidor per les connexions. No emmagatzema la teva IP al DHT. ⇥⇥⇥⇥ En lloc d&apos;això el DHT és utilitzat pels teus contactes per contactar amb tu mentre es processen peticions DHT estàndard.  ⇥⇥⇥⇥⇥⇥⇥⇥⇥⇥⇥⇥L&apos;indicador d&apos;estat es tornarà verd tan aviat com el Retroshare obtingui una resposta per DHT d&apos;un dels teus amics.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5127,7 +5850,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5795,7 +6518,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Arxiu d&apos;inici</translation>
     </message>
@@ -5803,38 +6526,38 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>a</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>ignora majúscules/minúscules</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>dd.mm.aaaa</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>kB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5842,12 +6565,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Giny d&apos;expressió</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Suprimir aquesta expressió</translation>
     </message>
@@ -6009,7 +6732,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Imatge</translation>
     </message>
@@ -6019,7 +6742,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Àudio</translation>
     </message>
@@ -6079,21 +6802,11 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Directoris dels amics</translation>
     </message>
@@ -6215,7 +6928,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -6250,6 +6963,10 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>Show State</source>
         <translation>Mostrar Estat</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">Nodes de confiança</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6257,7 +6974,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Mostra grups</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Grup</translation>
     </message>
@@ -6293,7 +7010,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Afegir al grup</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Cerca</translation>
@@ -6309,7 +7026,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Ordena per estat</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Detalls del perfil</translation>
     </message>
@@ -6553,7 +7270,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Confirma la petició d&apos;amic</translation>
     </message>
@@ -6570,6 +7287,10 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Cercar:</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6591,7 +7312,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Busca als amics</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Marcar tots/es</translation>
     </message>
@@ -6602,134 +7323,16 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Marcar cap</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Nom</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished">Adreça</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Estat</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Fer amic</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished">El repetidor no està activat o està trencat.
-Estan tots els serveis funcionant correctament??
-Comprova els teus ports!</translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Editar missatge d&apos;estat</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Difusió</translation>
     </message>
@@ -6812,38 +7415,33 @@ Comprova els teus ports!</translation>
         <translation>Restablir tipografia per defecte</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Clauer</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Xarxa&lt;/h1&gt; &lt;p&gt;La pestanya Xarxa mostra els nodes RertoShare dels teus amics: Els nodes de RetroShare veïns amb que estàs.connectat. &lt;/p&gt; &lt;p&gt;Pots agrupar els nodes en grups per millorar el control de l&apos;accés a les dades, per permetre només a alguns nodes veure alguns arxius.&lt;/p&gt; &lt;p&gt;A la dreta, trobaràs 3 útils pestanyes: &lt;ul&gt; &lt;li&gt;Difusió envia missatges a tots els nodes connectats a la vegada&lt;/li&gt;&lt;li&gt;El gràfic de xarxa propera mostra la xarxa al teu voltant, basant-se en la informació de descobriment&lt;/li&gt; &lt;li&gt;Anell de claus conté les claus que tens, principalment les reenviades pels nodes dels teus amics cap a tu&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Xat de difusió del RetroShare: Els missatges són enviats a tots els amics connectats.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Xarxa</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Gràfic de xarxa</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Estableix aquí el teu missatge d&apos;estat.</translation>
     </message>
@@ -6861,17 +7459,7 @@ Comprova els teus ports!</translation>
         <translation>Contrasenya</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Tots els camps són obligatoris amb un mínim de 3 caràcters</translation>
     </message>
@@ -6881,12 +7469,17 @@ Comprova els teus ports!</translation>
         <translation>Les contrasenyes no coincideixen</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation>Utilitza BOB</translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Aquesta contrasenya és pel PGP</translation>
@@ -6907,38 +7500,50 @@ Comprova els teus ports!</translation>
         <translation>Ha fallat la generació del teu nou certificat, potser la contrasenya PGP sigui incorrecta!</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <source>Options</source>
+        <translation type="vanished">Opcions</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation>Longitud de clau PGP</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Utilitza una contrasenya complicada. Aquesta contrasenya protegeix la clau privada del teu node!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si us plau, mou el ratolí una mica per captar tanta aleatorietat com sigui possible. És necessari arribar fins el 20% per crear la clau del teu node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Node estàndard</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">Node ocult Tor/I2P</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nom del teu node estableix la instancia de Retroshare que&lt;/p&gt;&lt;p&gt;s&apos;executarà en el teu ordinador.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <source>Use existing profile</source>
+        <translation type="vanished">Tornar a utilitzar un perfil existent</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Nom del node</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6958,12 +7563,12 @@ Comprova els teus ports!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nom del perfil t&apos;identifica a tu a la xarxa.&lt;/p&gt;&lt;p&gt;És l&apos;utilitzat pels teus amics per acceptar les teves connexions.&lt;/p&gt;&lt;p&gt;Pots crear multiples nodes de Retroshare amb el&lt;/p&gt;&lt;p&gt;mateix perfil a ordinadors diferents.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Exportar aquest perfil</translation>
     </message>
@@ -6973,43 +7578,42 @@ Comprova els teus ports!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pot ser una adreça Tor Onion del tipus: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;o una adreça I2P del tipus: [52 caràcters].b32.i2p &lt;/p&gt;Per tal d&apos;obtindre&apos;n una has de configurar o Tor o I2P per crear un nou servei ocult/servidor de túnel. &lt;p&gt;&lt;p&gt;Pots deixar-ho en blanc ara, però el teu node només funcionarà si poses una adreça Tor/I2P a les opcions del Retroshare a Opcions&gt;Xarxa-&gt;Panell de configuració de servei ocult.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les identitats s&apos;utilitzen quan escrius en sales de xat, fòrums i comentaris en canals. &lt;/p&gt;&lt;p&gt;També s&apos;empren quan envies/reps correus electrònics per la xarxa de Retroshare. Pots crear &lt;/p&gt;&lt;p&gt;una identitat signada ara o deixar-ho per més tard, quan ho necessitis.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>Som-hi!</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation>EtiquetaText</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Opcions avançades</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>adreça oculta</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>El teu perfil està associat a un parell de clau PGP. RetroShare ara mateix ignora les claus DSA.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquest és el teu port de connexió.&lt;/p&gt;&lt;p&gt;Qualsevol valor entre 1024 i 65535 &lt;/p&gt;&lt;p&gt;serà vàlid. Podràs canviar-ho més tard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7057,13 +7661,13 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>El teu perfil no s&apos;ha desat. Hi ha hagut un error.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importar perfil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Crear un nou perfil i un node nou de Retroshare</translation>
     </message>
@@ -7073,7 +7677,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Crear un node nou de Retroshare</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation>Adreça Tor/I2P</translation>
     </message>
@@ -7108,7 +7712,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7118,7 +7722,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La creació de node està desactivada fins que els camps estiguin completats correctament.&lt;/p&gt;</translation>
     </message>
@@ -7128,7 +7737,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>&lt;p&gt;La creació de node està desactivada fins que s&apos;hagi acumulat suficient aleatorietat. Si us plau, mou el ratolí fins que arribis com a mínim al 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation>Adreça de la instancia I2P amb BOB activat.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation>Adreça instancia I2P</translation>
     </message>
@@ -7354,13 +7968,36 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Començant</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Convidar amics</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;El RetroShare és res sense els teus amics. Clica en el botó per començar el procés.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Envia una invitació per correu electrònic amb el teu &quot;Id de Certificat&quot; al teus amics.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Assegurat de rebre la seva invitació també... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Només pots connectar-te amb els teus amics si tots dos us heu afegit com amics.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Afegir els teus amics al RetroShare</translation>
     </message>
@@ -7370,103 +8007,136 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation> Afegir amics </translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Connectar-se als amics</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&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;
+&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:12pt;&quot;&gt;Estigues en línia a la vegada que els teus amics i el Retroshare automàticament us connectarà!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;El teu client necessita trobar la xarxa Retroshare abans de poder fer les connexions.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Això pot trigar entre 5-30 minuts la primera vegada que engegues el RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;L&apos;indicador de DHT (A la barra d&apos;estat) es tornarà Verda quan pugui realitzar connexions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Al cap d&apos;un parell de minuts, l&apos;indicador de NAT (També a la barra d&apos;estat) canviarà a Groc o Verd.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Si continua Vermell, tens un Tallafocs Dolentot que el Retroshare té problemes per travessar.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Busca a la secció d&apos;Ajuda Extra per més consells sobre connectar-se.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;/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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&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;
 &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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avançat: Obrir port del tallafocs</translation>
+&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:12pt;&quot;&gt;Pots millorar el rendiment del Retroshare obrint un port extern. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Això accelerarà les connexions i permetrà que més gent connecti amb tu. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;La forma més senzilla de fer-ho és activant el UPnP en el teu encaminador o aparell Wifi.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Com que cada encaminador és diferent hauràs de ser tu qui trobi les instruccions per com fer-ho.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Si no saps de que t&apos;estem parlant no hi pensis més, el Retroshare continuarà funcionant.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&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;
+&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:12pt;&quot;&gt;Tens problemes per iniciar-te amb el RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Mira la PMF Viqui. És una mica antiga, estem intentant posar-la al dia.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Busca en els fòrums en línia. Fes preguntes i parla sobre les possibilitats.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Prova els fòrums interns de RetroShare &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;⇥- Apareixeran com disponibles quan et connectis amb amics.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) Si tot i així estàs encallat. Envia&apos;ns un correu.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Disfruta utilitzant el RetroShare&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Connectar-se als amics</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&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;
+&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:12pt;&quot;&gt;Quan els teus amics t&apos;envien la seva invitació, clica per obrir la finestra Afegir amics..&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enganxa el &amp;quot;Certificat ID&amp;quot; dels teus amics a la finestra i afegeix-los com amics.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avançat: Obrir port del tallafocs</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Més ajuda i suport</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Obrir lloc web del RS</translation>
     </message>
@@ -7491,7 +8161,7 @@ p, li { white-space: pre-wrap; }
         <translation>Resposta de correu electrònic</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>Invitació al RetroShare</translation>
     </message>
@@ -7541,12 +8211,12 @@ p, li { white-space: pre-wrap; }
         <translation>Resposta per RetroShare</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>Suport del RetroShare</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Té múltiples utilitats, incloent-hi xat, missatgeria, </translation>
     </message>
@@ -7670,7 +8340,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Mostra xat en grup</translation>
     </message>
@@ -7678,7 +8348,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[Desconegut]</translation>
     </message>
@@ -7844,11 +8514,20 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Pots fer que els teus amics sàpiguen del teu fòrum compartint-lo amb ells. Escull els amics amb qui vols compartir el teu fòrum.</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">Compartir els permisos d&apos;administrador del tema</translation>
+    </message>
+    <message>
+        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
+        <translation type="vanished">Pots permetre als teus amics editar el tema. Selecciona&apos;ls a la llista inferior.
+Nota: No es poden revocar els permisos d&apos;administrador publicats</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Títol</translation>
     </message>
@@ -7861,12 +8540,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Descripció</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7891,7 +8570,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">Ordena en ordre descendent</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">Ordena en ordre ascendent</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">Ordena per nom</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Ordena per popularitat</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Ordena per darrer missatge</translation>
+    </message>
+    <message>
+        <source>Sort by Number of Posts</source>
+        <translation type="vanished">Ordenar per nombre de publicacións</translation>
+    </message>
+    <message>
+        <source>Sort by Unread</source>
+        <translation type="vanished">Ordena per no llegit</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Ets l&apos;administrador (Modifica noms i descripció utilitzant el menú Editar)</translation>
     </message>
@@ -7906,14 +8613,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Darrera publicació</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
@@ -7924,13 +8631,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularitat</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Mostra</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7943,7 +8654,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>i</translation>
     </message>
@@ -8079,7 +8790,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Canals</translation>
@@ -8090,22 +8801,26 @@ p, li { white-space: pre-wrap; }
         <translation>Crear canal</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Activa l&apos;auto-descàrrega</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Els meus canals</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Canals&lt;/h1&gt; &lt;p&gt;Canals et permet publicar dades (Ex: pel·lícules, música) que es propagaran per la xarxa&lt;/p&gt; &lt;p&gt;Pots veure els canals als que tens amics subscrits i tu faràs el mateix amb els teus. Això promociona els canals populars dins la xarxa.&lt;/p&gt; &lt;p&gt;Només el creador del canal pot publicar en un canal. Els altres contactes a la xarxa només poden llegir el canal, a no ser que el canal sigui privat. No obstant, pots compartir els drets de publicació o lectura amb nodes de Retroshare amics.&lt;/p&gt; &lt;p&gt;Els canals poden ser anònims o associats a una identitat de Retroshare per tal que els lectors puguin contactar amb tu si volen. Activa &quot;Permetre comentaris&quot; si vols permetre que els usuaris facin comentaris sobre el que publiques.&lt;/p&gt;&lt;p&gt;Les entrades publicades es mantenen durant %1 dies, i es sincronitzen pels últims %2 dies, a no ser que ho canviïs.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Canals subscrits</translation>
     </message>
@@ -8125,12 +8840,12 @@ p, li { white-space: pre-wrap; }
         <translation>Seleccionar directori de descarrega del canal</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Desactivar auto-descàrrega</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>Seleccionar directori de descarrega</translation>
     </message>
@@ -8165,22 +8880,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Reproduir</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Obrir directori</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -8200,17 +8915,17 @@ p, li { white-space: pre-wrap; }
         <translation>Comprovant</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Segur que vols cancel·lar i esborrar aquest arxiu?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>No es pot obrir el directori</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Reproduir arxiu</translation>
     </message>
@@ -8220,10 +8935,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">L&apos;arxiu %1 no existeix a la ruta.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulari</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Nom d&apos;arxiu</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Mida</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Títol</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Publicat</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Estat</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Crear nou canal</translation>
     </message>
@@ -8261,19 +9003,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Subscriu-te al canal</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8287,7 +9019,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -8302,7 +9034,7 @@ p, li { white-space: pre-wrap; }
         <translation>Descripció del canal</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Carregant</translation>
     </message>
@@ -8317,9 +9049,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">Mai</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Nou canal</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8330,7 +9061,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Nou comentari:</translation>
     </message>
@@ -8351,7 +9082,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Reproduir</translation>
     </message>
@@ -8407,24 +9138,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Arxius</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Avís! Tens menys de %1 hores i %2 minuts abans que aquest arxiu sigui esborrat. Considera desar-lo.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Nou</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Comentari</translation>
     </message>
@@ -8439,17 +9174,21 @@ p, li { white-space: pre-wrap; }
         <translation>No m&apos;agrada</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Carregant</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation>Comentaris</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8474,16 +9213,139 @@ p, li { white-space: pre-wrap; }
         <translation>Reproduir Medi</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Publica al canal</translation>
+    </message>
+    <message>
+        <source>Add new post</source>
+        <translation type="vanished">Afegir nova publicació</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Carregant</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Cercar canals</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Títol</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Cerca títol</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Missatge</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Cercar missatge</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Nom d&apos;arxiu</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Cercar arxiu</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">No hi ha canal seleccionat</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Mai</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Públic</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle &quot;</source>
+        <translation type="vanished">Restringit a membres del cercle &quot;</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle </source>
+        <translation type="vanished">Restringit a membres del cercle</translation>
+    </message>
+    <message>
+        <source>Your eyes only</source>
+        <translation type="vanished">Només per tu</translation>
+    </message>
+    <message>
+        <source>You and your friend nodes</source>
+        <translation type="vanished">Per tu i pels nodes dels teus amics</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Desactivar auto-descàrrega</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Activar auto-descàrrega</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Mostra fonts</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Mostra arxius</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Administrador:</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Última publicació:</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">desconegut</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Distribució:</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Fonts</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Arxius</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Subscriptors</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descripció:</translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">Publicat (A nodes veïns):</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Publica al canal</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished">Afegir nova publicació</translation>
     </message>
@@ -8553,7 +9415,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8579,7 +9441,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+41"/>
         <source>Details</source>
-        <translation type="unfinished">Detalls</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+83"/>
@@ -8589,7 +9451,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Comentaris</translation>
     </message>
@@ -8604,13 +9466,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Fonts</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8625,7 +9487,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8640,7 +9502,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8700,22 +9562,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8790,13 +9642,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Per tu i pels nodes dels teus amics</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Subscrit</translation>
     </message>
@@ -8833,7 +9684,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>Enable Auto-Download</source>
-        <translation type="unfinished">Activa l&apos;auto-descàrrega</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -8847,17 +9698,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8877,11 +9728,27 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Eliminar l&apos;element</translation>
     </message>
+    <message>
+        <source>for identity </source>
+        <translation type="vanished">per identitat</translation>
+    </message>
+    <message>
+        <source>You received a membership request for circle:</source>
+        <translation type="vanished">Has rebut una petició de pertinença al cercle:</translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Accepta la petició de pertinença</translation>
     </message>
+    <message>
+        <source>Revoke membership request</source>
+        <translation type="vanished">Rebutja la petició de pertinença</translation>
+    </message>
+    <message>
+        <source>You received an invitation for circle:</source>
+        <translation type="vanished">Has rebut una invitació pel cercle:</translation>
+    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -8972,7 +9839,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Contenidor de comentari</translation>
     </message>
@@ -8985,7 +9852,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9015,7 +9882,7 @@ p, li { white-space: pre-wrap; }
         <translation>Refrescar</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Comentari</translation>
@@ -9054,7 +9921,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Resposta al comentari</translation>
     </message>
@@ -9078,21 +9945,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Votar negatiu</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9102,7 +9954,7 @@ p, li { white-space: pre-wrap; }
         <translation>Fer comentari</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9131,10 +9983,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Comentari&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Signat per</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9163,7 +10031,7 @@ before you can comment</source>
 abans de poder comentar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9205,6 +10073,14 @@ abans de poder comentar</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Afegir administradors de fòrum</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Seleccionar administradors de fòrum</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9214,7 +10090,7 @@ abans de poder comentar</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Subscriure&apos;s al fòrum</translation>
     </message>
@@ -9230,7 +10106,7 @@ abans de poder comentar</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -9250,9 +10126,8 @@ abans de poder comentar</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Carregant</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9283,13 +10158,13 @@ abans de poder comentar</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Assumpte:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Donar de baixa del fòrum</translation>
     </message>
@@ -9300,7 +10175,7 @@ abans de poder comentar</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -9320,17 +10195,21 @@ abans de poder comentar</translation>
         <translation>En resposta a:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Carregant</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Font del fòrum</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
@@ -9343,66 +10222,63 @@ abans de poder comentar</translation>
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Comença nova conversa al fòrum seleccionat</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Cercar fòrums</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Darrer missatge</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation>Nova conversa</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Vista per conversa</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Vista plana</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Títol</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Desar imatge</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Carregant</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9412,7 +10288,12 @@ abans de poder comentar</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Respondre missatge</translation>
     </message>
@@ -9436,6 +10317,10 @@ abans de poder comentar</translation>
         <source>Download all files</source>
         <translation>Descarregar tots els arxius</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Següent no llegit</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9452,23 +10337,35 @@ abans de poder comentar</translation>
         <translation>Cerca autor</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Contingut</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Cerca contingut</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Subscriure&apos;s al fòrum buscarà les entrades publicades disponibles dels teus amics subscrits, i farà el fòrum visible a tots els teus altres amics.&lt;/p&gt;&lt;p&gt;Després podràs des-subscriure&apos;t des del menú contextual de la llista de fòrums a l&apos;esquerra.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Sense nom</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9511,12 +10408,20 @@ abans de poder comentar</translation>
         <translation>Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Ampliar</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Expulsat]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[desconegut]</translation>
     </message>
@@ -9546,8 +10451,8 @@ abans de poder comentar</translation>
         <translation>Només per tu</translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation>Distribució</translation>
     </message>
@@ -9561,6 +10466,26 @@ abans de poder comentar</translation>
         <source>Anti-spam</source>
         <translation>Anti-spam</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Missatge modificat ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anònim</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">signat</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">cap</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Missatge perdut ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9630,12 +10555,16 @@ abans de poder comentar</translation>
         <translation>Missatge original</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation>Nova conversa</translation>
     </message>
     <message>
-        <location line="+331"/>
+        <source>Read status</source>
+        <translation type="vanished">Estat de lectura</translation>
+    </message>
+    <message>
+        <location line="+318"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
@@ -9696,7 +10625,7 @@ abans de poder comentar</translation>
         <translation>Reputació de l&apos;autor</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9716,7 +10645,7 @@ abans de poder comentar</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Els missatges anònims/desconeguts es propagaran si la reputació és positiva</translation>
     </message>
@@ -9768,7 +10697,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9778,7 +10707,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9793,7 +10722,26 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <source>Information for this identity is currently missing.</source>
+        <translation type="vanished">No hi ha informació per aquesta identitat</translation>
+    </message>
+    <message>
+        <source>You have banned this ID. The message will not be
+displayed nor forwarded to your friends.</source>
+        <translation type="vanished">Has prohibit aquesta identitat. El missatge no es mostrarà ni propagarà als teus amics.</translation>
+    </message>
+    <message>
+        <source>You have not set an opinion for this person,
+ and your friends do not vote positively: Spam regulation 
+prevents the message to be forwarded to your friends.</source>
+        <translation type="vanished">No has establert una opinió per aquesta persona i els teus amics no opinien positivament: L&apos;anti-spam evita que el missatge sigui propagat als teus amics.</translation>
+    </message>
+    <message>
+        <source>Message will be forwarded to your friends.</source>
+        <translation type="vanished">El missatge es propagarà als teus amics.</translation>
+    </message>
+    <message>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation>(Nou)</translation>
     </message>
@@ -9802,6 +10750,10 @@ This message is missing. You should receive it later.</source>
         <source>(Old) </source>
         <translation>(Vell)</translation>
     </message>
+    <message>
+        <source>You cant act on the author to a non-existant Message</source>
+        <translation type="vanished">No pots fer res a l&apos;autor d&apos;un missatge que no existeix</translation>
+    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -9859,12 +10811,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Fòrums&lt;/h1&gt; 			&lt;p&gt;Els fòrums de Retroshare es veuen com fòrums d&apos;Internet, però funcionen de forma descentralitzada&lt;/p&gt; 			&lt;p&gt;Tu veus els fòrums als que els teus amics estan subscrits i tu fas el mateix amb els teus			 pels teus amics. Això promociona automàticament els fòrums interessants a la xarxa.&lt;/p&gt; &lt;p&gt;Els missatges es mantenen durant %1 dies i es sincronitzen durant %2 dies, si no ho canvies.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Fòrums</translation>
@@ -9895,16 +10847,35 @@ This message is missing. You should receive it later.</source>
         <translation>Altres fòrums</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Esperant</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Recuperant</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Carregant</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Afegir icona</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Els destinataris de les claus poden publicar en grups restringits, i poden veure i publicar en canals privats</translation>
     </message>
@@ -9913,14 +10884,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Compartir clau pública</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">comprovar els contactes amb qui t&apos;agradaria compartir les claus de publicació</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Compartir clau amb</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Descripció</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Distribució de missatge</translation>
     </message>
@@ -9928,7 +10907,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Públic</translation>
     </message>
@@ -9947,6 +10926,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nova conversa</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Requerit</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Encriptar missatge</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9988,7 +10975,7 @@ This message is missing. You should receive it later.</source>
         <translation>Protecció-Spam</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Comentari:</translation>
     </message>
@@ -10011,7 +10998,7 @@ This message is missing. You should receive it later.</source>
         <translation>Anti Spam:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10027,12 +11014,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation>Restringit al cercle:</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation>Limitat als teus amics</translation>
     </message>
@@ -10049,23 +11036,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>Seguiment de missatges</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>Signatura PGP requerida</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation>Només els nodes d&apos;amics al grup</translation>
     </message>
@@ -10081,28 +11068,30 @@ This message is missing. You should receive it later.</source>
         <translation>Si us plau, afegeix un nom</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>Signatura PGP de ID coneguda requerida</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Carrega logotip del grup</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Publicar canvis al grup</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Fallo al preparar les metadades del Grup - Revisa-les</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">S&apos;utilitzarà per enviar resposta</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Propietari:</translation>
     </message>
@@ -10112,12 +11101,12 @@ This message is missing. You should receive it later.</source>
         <translation>Estableix una descripció</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Informació</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10127,7 +11116,7 @@ This message is missing. You should receive it later.</source>
         <translation>Darrer missatge</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Els missatges es distribuiran més enllà dels nodes dels teus amics, sempre que la gent es subscrigui al canal/fòrum/publicació que creis.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -10202,12 +11191,7 @@ This message is missing. You should receive it later.</source>
         <translation>Defavorir IDs no signats i IDs de nodes desconeguts</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Popularitat</translation>
     </message>
@@ -10223,22 +11207,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Autor</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>EtiquetaGxsId</translation>
     </message>
@@ -10246,7 +11235,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Carregant</translation>
     </message>
@@ -10306,7 +11295,7 @@ This message is missing. You should receive it later.</source>
         <translation>Editar detalls</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation>Sincronitza els missatges dels/de les últims/es...</translation>
     </message>
@@ -10363,12 +11352,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <source>Share publish permissions</source>
+        <translation type="vanished">Compartir permisos de publicació</translation>
+    </message>
+    <message>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Copia l&apos;enllaç RetroShare</translation>
     </message>
@@ -10391,7 +11384,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Sense signatura</translation>
     </message>
@@ -10404,24 +11397,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Carregant</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>No trobat</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Sense signatura</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Expulsat]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Autenticació</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>clau desconeguda</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">anònim</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10431,12 +11440,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Identitat&amp;nbsp;nom</translation>
     </message>
@@ -10450,20 +11454,16 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished">Node</translation>
     </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">Signat&amp;nbsp;per</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Desconegut]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10475,7 +11475,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10523,13 +11523,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Desconegut]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Carregant</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10646,6 +11650,10 @@ This message is missing. You should receive it later.</source>
         <source>Group ID / Author</source>
         <translation>ID Grup / Autor</translation>
     </message>
+    <message>
+        <source>Number of messages / Publish TS</source>
+        <translation type="vanished">Nombre de missatges / TS publicats</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -10661,6 +11669,10 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation>Popularitat</translation>
     </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Dells</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -10693,6 +11705,41 @@ This message is missing. You should receive it later.</source>
         <translation>No</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">Túnels autenticats:</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">ID túnel: %1</translation>
+    </message>
+    <message>
+        <source>from: %1</source>
+        <translation type="vanished">de: %1</translation>
+    </message>
+    <message>
+        <source>to: %1</source>
+        <translation type="vanished">a: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">estat: %1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">total enviat: %1 bytes</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">Total rebut: %1 bytes</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Contacte desconegut</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10905,12 +11952,48 @@ This message is missing. You should receive it later.</source>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Retroshare és una plataforma descentralitzada&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;segura i privada de comunicacions, de codi obert i multi-plataforma. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Permet compartir tot el que vulguis amb seguretat amb amics &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt; utilitzant certificats per autenticar els contactes i OpenSSL per encriptar les comunicacions.&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Retroshare proporciona compartició d&apos;arxius, xat, missatgeria i canals.&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Enllaços externs útils amb més informació:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Pàgina web del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Viqui del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Fòrum del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Plana de projecte del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Bloc de l&apos;equip del Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Twitter Desenvolupament Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+37"/>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10926,7 +12009,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Autors</translation>
     </message>
@@ -10945,7 +12028,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10958,6 +12041,38 @@ 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traducció Retroshare:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Plana web traductors Retroshare:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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;Alemany: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Keller&lt;/span&gt; &amp;lt;&lt;span style=&quot; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&amp;gt;&lt;/p&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;Català: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; Josep Creus&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;creus.informatic@gmail.com&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-weight:600;&quot;&gt;Polac: &lt;/span&gt;Maciej Mrug&lt;/p&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;Suec: &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -11023,12 +12138,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+121"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+158"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11043,7 +12158,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11052,12 +12167,32 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Did you receive a certificate from a friend?</source>
+        <translation type="vanished">Has rebut un certificat de part d&apos;un amic?</translation>
+    </message>
+    <message>
+        <source>Add friends certificate</source>
+        <translation type="vanished">Afegir certificat d&apos;un amic</translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">Afegir arxiu de certificat</translation>
+    </message>
+    <message>
+        <source>Share your RetroShare Key</source>
+        <translation type="vanished">Comparteix la teva clau de Retroshare</translation>
+    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
+        <translation type="vanished">El text a sota és el teu certificat de Retroshare. Envia&apos;l als teus amic</translation>
+    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -11067,12 +12202,20 @@ private and secure decentralized communication platform.
 </translation>
     </message>
     <message>
-        <location line="+134"/>
+        <source>Launch startup wizard</source>
+        <translation type="vanished">Executar assistent d&apos;inici</translation>
+    </message>
+    <message>
+        <source>Do you need help with RetroShare?</source>
+        <translation type="vanished">Necessites ajuda amb el RetroShare?</translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>Open Web Help</source>
         <translation>Ajuda a la web oberta</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Copiar el teu certificat al porta-retalls</translation>
     </message>
@@ -11082,7 +12225,7 @@ private and secure decentralized communication platform.
         <translation>Desar el teu certificar a un arxiu</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>Enviar per correu</translation>
     </message>
@@ -11102,37 +12245,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11144,12 +12263,17 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+16"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11158,11 +12282,19 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Benvingut a Retroshare!&lt;/h1&gt; &#xa0;&lt;p&gt;Necessites &lt;b&gt;fer amics&lt;/b&gt;! Un cop hagis creat una xarxa de nodes de Retroshare, o t&apos;hagis unit a una xarxa existent,	 podràs intercanviar arxius, xatejar, parlar a fòrums, etc.&lt;/p&gt;&lt;div align=center&gt;&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;&lt;/div&gt;&lt;p&gt;Per fer-ho, copia el teu certificat d&apos;aquesta pàgina i envia&apos;l als teus amics, i afegeix aquí els certificats del teus amics.&lt;/p&gt;    &lt;p&gt;Una altra opció és cercar a internet per &quot;servidors de xat de Retroshare&quot; (administrats independentment). Els servidors et permeten intercanviar certificats amb un node de Retroshare dedicat, utilitzant-lo podràs trobar altres persones anònimament.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Invitació de RetroShare</translation>
     </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">S&apos;ha copiat el teu certificat al porta-retalls, enganxa&apos;l i envia&apos;l al teu amic per correu</translation>
+    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -11434,14 +12566,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Tot</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Reputació</translation>
     </message>
@@ -11451,12 +12583,12 @@ p, li { white-space: pre-wrap; }
         <translation>Cerca</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>Id anònim</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Crear nova identitat</translation>
     </message>
@@ -11466,7 +12598,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crear nou cercle</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>Persones</translation>
     </message>
@@ -11481,27 +12613,27 @@ p, li { white-space: pre-wrap; }
         <translation>Persona</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Tancar</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation>Opció-expulsar:</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Expulsa automàticament totes les identitats signades pel mateix node</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation>Vots de l&apos;amic:</translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Vots positius</translation>
     </message>
@@ -11517,39 +12649,29 @@ p, li { white-space: pre-wrap; }
         <translation>Vots negatius</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation>Estadístiques d&apos;ús</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Nom del cercle</translation>
     </message>
@@ -11569,20 +12691,18 @@ p, li { white-space: pre-wrap; }
         <translation>Cercles personals</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Editar identitat</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Esborrar identitat</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Xatejar amb aquest contacte</translation>
     </message>
@@ -11592,78 +12712,98 @@ p, li { white-space: pre-wrap; }
         <translation>Començar un xat distant amb aquest contacte</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation>Id del node propietari:</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Nom de la identitat:</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>Id d&apos;identitat</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Enviar missatge</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Informació d&apos;identitat</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Id d&apos;identitat:</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Nom del node propietari:</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation>Crear nou...</translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Tipus:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Enviar invitació</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La opinió mitjana dels nodes veïns sobre aquesta identitat. Negativa és dolent,&lt;/p&gt;&lt;p&gt;positiva és bo. Zero és neutre.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>La teva opinió:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La teva opinió sobre una identitat controla la visibilitat d&apos;aquesta per tu i els teus nodes amics. La teva opinió es comparteix amb els teus amics i s&apos;utilitza per calcular una puntuació de reputació: Si la teva opinió sobre una identitat és neutre, la puntuació de reputació és la mitjana de l&apos;opinió dels teus amics. Si no, la teva opinió estableix la puntuació.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La puntuació total s&apos;utilitza en les sales de xat, fòrums i canals per decidir que fer amb cada identitat. Quan la puntuació està per sota de -1 la identitat és expulsada, tots els missatges, fòrums i canals per dita identitat no es reenvien, en cap sentit. Alguns fòrums tenen una opció anti-SPAM que obliga a tindre un nivell de reputació no negatiu, fent que siguin més sensibles a males reputacions. Les identitats expulsades van perdent gradualment la seva activitat i finalment desapareixent (després de 5 dies). &lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pots canviar aquests mínims i el temps d&apos;inactivitat per esborrar una identitat a Preferencies -&amp;gt; Gent. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Negatiu</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>Neutre</translation>
     </message>
@@ -11674,17 +12814,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positiu</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La puntuació de reputació global, calculada amb les teves puntuacions i la dels teus amics.&lt;/p&gt;&lt;p&gt;Negativa és dolent, positiva és bo. Zero és neutre. Si la puntuació és massa baixa,&lt;/p&gt;&lt;p&gt;la identitat es marca com dolenta, i es filtrarà als fòrums, sales de xat,&lt;/p&gt;&lt;p&gt;canals, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Global:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anònim</translation>
     </message>
@@ -11699,24 +12839,24 @@ p, li { white-space: pre-wrap; }
         <translation>ID cerca</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Aquesta identitat és propietat teva</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>Les meves identitats</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>Els meus contactes</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation>Mostrar elements</translation>
     </message>
@@ -11731,12 +12871,7 @@ p, li { white-space: pre-wrap; }
         <translation>Associat al meu node</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>Altres cercles</translation>
     </message>
@@ -11746,7 +12881,7 @@ p, li { white-space: pre-wrap; }
         <translation>Cercles als que pertanyo</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>ID Cercle:</translation>
     </message>
@@ -11821,7 +12956,7 @@ p, li { white-space: pre-wrap; }
         <translation>No ets membre (No tens accés a dades limitades a aquest cercle)</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>Id d&apos;identitat:</translation>
     </message>
@@ -11851,7 +12986,7 @@ p, li { white-space: pre-wrap; }
         <translation>desconegut</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>Convidat</translation>
     </message>
@@ -11866,7 +13001,7 @@ p, li { white-space: pre-wrap; }
         <translation>Membre</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>Editar cercle</translation>
     </message>
@@ -11914,7 +13049,7 @@ p, li { white-space: pre-wrap; }
         <translation>Permet pertinença</translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11925,7 +13060,7 @@ T&apos;hauries de lliurar d&apos;ella i utilitzar-ne una de nova.
 Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Node desconegut]</translation>
@@ -11968,7 +13103,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Identitat anònima</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12048,7 +13183,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation>informació</translation>
     </message>
@@ -12064,12 +13199,29 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Copiar identitat al porta-retalls</translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <source>Send invite?</source>
+        <translation type="vanished">Enviar invitació?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Estàs segur de voler enviar una invitació amb el teu certificat?</translation>
+    </message>
+    <message>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Expulsat</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identitats&lt;/h1&gt;&lt;p&gt;En aquesta pestanya pots crear/editar identitats &lt;b&gt;pseudo-anònimes&lt;/b&gt; i &lt;b&gt;cercles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Les &lt;b&gt;Identitats&lt;/b&gt; s&apos;utilitzen per identificar les teves dades: signar missatges publicats a les sales de xat, fòrums i canals, rebre comentaris utilitzant el sistema intern de correu electrònic o publicar-ne a entrades dels canals, xatejar utilitzant túnels segurs, etc.&lt;/p&gt; &lt;p&gt;Les identitats poden estar &lt;b&gt;signades&lt;/b&gt; pel certificat del seu node de Rertoshare. És més fàcil confiar en identitats signades però es poden seguir fàcilment fins a la IP del node al que pertanyen.&lt;/p&gt; &lt;p&gt;Les &lt;b&gt;identitats anònimes&lt;/b&gt; et permetran interactuar amb altres usuaris de forma anònima. No es poden falsificar, però ningú pot provar qui té en realitat una determinada identitat.&lt;/p&gt; &lt;p&gt;Els &lt;b&gt;cercles&lt;/b&gt; són grups d&apos;identitats (anònimes o signades) que són compartides a certa distancia, salts entre nodes, per la xarxa. Es poden utilitzar per restringir la visibilitat de fòrums, canals, etc. &lt;/p&gt; 	&lt;p&gt;Un &lt;b&gt;cercle&lt;/b&gt; pot estar restringit a un altre cercle, limitant la visibilitat als membres d&apos;aquest cercle o inclús es pot auto-restringir, que vol dir que només es visible a membres invitats.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Unknown ID:</source>
+        <translation type="vanished">ID desconegut:</translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation>positiu</translation>
     </message>
@@ -12113,11 +13265,19 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>Forums</source>
         <translation>Fòrums</translation>
     </message>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Enviat</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Xat</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Desconegut</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12138,6 +13298,14 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>Creació de signatura d&apos;autor al servei %1</translation>
     </message>
+    <message>
+        <source>Message/vote/comment</source>
+        <translation type="vanished">Missatge/vot/comentari</translation>
+    </message>
+    <message>
+        <source>%1 in %2 tab</source>
+        <translation type="vanished">%1 a la pestanya %2</translation>
+    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12158,11 +13326,19 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Signatura al sistema de túnel distant.</translation>
     </message>
+    <message>
+        <source>Update of identity data.</source>
+        <translation type="vanished">Actualització de dades d&apos;identitat</translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Comprovació de signatura genèrica</translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">Signatura genèrica</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12174,7 +13350,11 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Desencriptació genèrica</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <source>Membership verification in circle %1.</source>
+        <translation type="vanished">Comprovació de pertinença al cercle %1.</translation>
+    </message>
+    <message>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation>Afegir a contactes</translation>
     </message>
@@ -12224,21 +13404,21 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Hola,&lt;br&gt; vull ser amic amb tu en el RetroShare.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Gent</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>El teu avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>Associat a nodes veïns</translation>
     </message>
@@ -12248,7 +13428,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Associat a nodes distants</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Associat a un node de RetroShare d&apos;un amic</translation>
     </message>
@@ -12263,7 +13443,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Associat a un node de RetroShare desconegut</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Xat amb aquesta persona</translation>
     </message>
@@ -12278,12 +13458,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Xat distant rebutjat amb aquesta persona.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>Últim utilitzat:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP conegut</translation>
     </message>
@@ -12303,12 +13483,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Estàs segur de voler esborrar aquesta identitat?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Propietat de</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Nom del node:</translation>
     </message>
@@ -12318,7 +13498,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>ID node :</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>Segur que vols esborrar?</translation>
     </message>
@@ -12326,7 +13506,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Sobrenom</translation>
     </message>
@@ -12356,7 +13536,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Pseudònim</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12366,19 +13546,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Nova identitat</translation>
     </message>
@@ -12392,7 +13565,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12402,12 +13575,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Editar identitat</translation>
@@ -12418,27 +13586,27 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished">Actualitza</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12458,7 +13626,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12468,7 +13636,11 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Error obtenint clau!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Error de IDClau invàlida</translation>
     </message>
@@ -12483,7 +13655,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Nom real desconegut</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Crear nova identitat</translation>
     </message>
@@ -12493,15 +13665,10 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Tipus</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Treure</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12527,7 +13694,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Afegir</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
@@ -12537,13 +13704,17 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>El teu avatar</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Escull avatar</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>Associat al teu perfil</translation>
     </message>
@@ -12553,7 +13724,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Pots tindre una o més identitats. S&apos;utilitzen quan escrius en sales de xat, fòrums i comentes en canals. Funcionen també com a destinataris en xats distants i en el sistema de correu distant de RetroShare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>El sobrenom és massa curt. Si us plau, introdueix com a mínim %1 caràcters.</translation>
     </message>
@@ -12612,6 +13783,10 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>PGP name:</source>
         <translation>Nom PGP:</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">id GXS:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12627,7 +13802,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -12637,12 +13812,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Treure</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Marcar totes</translation>
     </message>
@@ -12661,38 +13836,26 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <source>Quote</source>
         <translation type="unfinished">Cita</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Enviar</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Desar imatge</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>No es pot guardar la imatge, nom de l&apos;arxiu invàlid</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation>No és una imatge</translation>
     </message>
@@ -12710,32 +13873,27 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Estat:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12756,12 +13914,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12770,31 +13923,26 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Obrir arxiu</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Obrir directori</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Comprovant...</translation>
     </message>
@@ -12804,7 +13952,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>comprovar arxius</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation>Recomanar en un missatge a...</translation>
     </message>
@@ -12832,7 +13980,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Afegeix amic</translation>
     </message>
@@ -12848,8 +13996,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Opcions</translation>
     </message>
@@ -12870,7 +14017,7 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Sortir</translation>
     </message>
@@ -12881,12 +14028,12 @@ Aquestes identitats deixaran de ser suportades en breu.</translation>
         <translation>Auxiliar d&apos;inici ràpid</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 és una plataforma de comunicació segura descentralitzada</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Inacabat</translation>
     </message>
@@ -12913,12 +14060,11 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Estat</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Notificar</translation>
     </message>
@@ -12929,35 +14075,31 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Obrir Missatges</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Gràfic d&apos;ample de banda</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Aplicacions</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Minimitzar</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Maximitzar</translation>
     </message>
@@ -12972,12 +14114,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 missatges nous</translation>
     </message>
@@ -13007,7 +14144,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>%1 amics connectats</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Segur que vols sortir del RetroShare?</translation>
     </message>
@@ -13027,7 +14164,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Assegura&apos;t de que aquest enllaç no ha estat modificat per portar-te a un lloc web malicios.</translation>
     </message>
@@ -13072,13 +14209,12 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Taula de permisos dels serveis</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Estadístiques</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Mostrar interficie web</translation>
     </message>
@@ -13093,7 +14229,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>directori s&apos;està acabant (L&apos;actual límit és</translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>Segur que vols sortir ? </translation>
     </message>
@@ -13102,17 +14238,17 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Redacta</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Contactes</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Paràgraf</translation>
     </message>
@@ -13148,12 +14284,12 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Capçalera 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Mida del tipus de lletra</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Augmentar la mida del tipus de lletra</translation>
     </message>
@@ -13168,32 +14304,32 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Negreta</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Alineació</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Afegir una imatge</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Posa el tipus de lletra del text com si fos codi</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Subratllat</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Assumpte:</translation>
     </message>
@@ -13204,32 +14340,32 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Etiquetes</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>Llista d&apos;adreces:</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation>Recomanar aquest amic</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Estableix color de lletra</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Estableix color de fons de la lletra</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Arxius recomanats</translation>
     </message>
@@ -13299,7 +14435,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Afegir citació</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Enviar a:</translation>
     </message>
@@ -13323,6 +14459,10 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <source>&amp;Justify</source>
         <translation>&amp;Justificat</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">Totes les adreces (mesclades)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13334,7 +14474,7 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>Els meus contactes</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hola,&lt;br&gt;Et recomano un bon amic meu; pots confiar en ell si confies en mi. &lt;br&gt;</translation>
     </message>
@@ -13354,18 +14494,18 @@ Si us plau, allibera una mica d&apos;espai i clica Ok.</translation>
         <translation>vol ser amic teu al RetroShare</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hola %1, &lt;br&gt;&lt;br&gt;%2 vol ser amic teu al RetroShare.&lt;br&gt;&lt;br&gt;Respondre ara:&lt;br&gt;%3 &lt;br&gt;&lt;br&gt;Gràcies,&lt;br&gt;L&apos;equip RetroShare</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Desar el missatge</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>El missatge no s&apos;ha enviat.
@@ -13377,17 +14517,7 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Enganxa l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Afegir a &quot;A&quot;</translation>
     </message>
@@ -13407,7 +14537,7 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Afegir com a recomanat</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Missatge original</translation>
     </message>
@@ -13417,21 +14547,21 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Des de</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Enviat</translation>
     </message>
@@ -13446,7 +14576,7 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>A %1, %2 va escriure:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13456,30 +14586,30 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Reenvia:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Vols enviar el missatge sense especificar un assumpte?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Si us plau, introdueix almenys un destinatari.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>C/o</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Desconegut</translation>
     </message>
@@ -13594,13 +14724,13 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Detalls</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Obrir arxiu...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Arxius HTML (*.htm *.html);;Tots els arxius (*)</translation>
     </message>
@@ -13620,7 +14750,7 @@ Vols desar el missatge a la bústia d&apos;esborranys?</translation>
         <translation>Exportar a PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>El missatge no s&apos;ha enviat.
@@ -13642,7 +14772,7 @@ Voleu desar el missatge?</translation>
         <translation>Afegir arxiu extra</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Hola,&lt;br&gt; vull ser amic amb tu en el RetroShare.&lt;br&gt;</translation>
     </message>
@@ -13666,24 +14796,28 @@ Voleu desar el missatge?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">Tens una petició d&apos;amistat</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Respondre ara:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Tancar</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>Nodes de l&apos;amic</translation>
     </message>
@@ -13728,13 +14862,13 @@ Voleu desar el missatge?</translation>
         <translation>Llista ordenada (romanic ascendent)</translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Gràcies, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Identitat distant:</translation>
     </message>
@@ -13744,12 +14878,12 @@ Voleu desar el missatge?</translation>
         <translation>[Falta]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Si us plau, crea una identitat per signar missatges distants o treu els contactes distants de la llista de destinataris.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Nom i Id del node:</translation>
     </message>
@@ -13827,7 +14961,7 @@ Voleu desar el missatge?</translation>
         <translation>Per defecte</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Una pestanya nova</translation>
     </message>
@@ -13837,7 +14971,7 @@ Voleu desar el missatge?</translation>
         <translation>Una finestra nova</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Editar etiqueta</translation>
     </message>
@@ -13860,7 +14994,7 @@ Voleu desar el missatge?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Sub:</translation>
     </message>
@@ -13868,7 +15002,7 @@ Voleu desar el missatge?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Missatge</translation>
     </message>
@@ -13896,7 +15030,7 @@ Voleu desar el missatge?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Arxius recomanats</translation>
     </message>
@@ -13906,37 +15040,37 @@ Voleu desar el missatge?</translation>
         <translation>Descarregar tots els arxius recomanats</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Assumpte:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>CC:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>C/o:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Etiquetes:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Resposta</translation>
     </message>
@@ -13976,7 +15110,7 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>Envia invitació</translation>
     </message>
@@ -14028,7 +15162,7 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Confirma %1 com amic</translation>
     </message>
@@ -14038,12 +15172,12 @@ Voleu desar el missatge?</translation>
         <translation>Afegeix %1 com amic</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Sense assumpte</translation>
     </message>
@@ -14053,22 +15187,17 @@ Voleu desar el missatge?</translation>
         <translation>Descarregar</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14078,23 +15207,21 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
+        <source>Send invite?</source>
+        <translation type="vanished">Enviar invitació?</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Estàs segur de voler enviar una invitació amb el teu certificat?</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Descarregar tot</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Imprimir document</translation>
     </message>
@@ -14109,12 +15236,12 @@ Voleu desar el missatge?</translation>
         <translation>Arxius-HTML (*.htm *.html);;Tots els arxius (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Carregar sempre les imatges per aquest missatge</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Oculta el panell d&apos;adjunció</translation>
     </message>
@@ -14136,6 +15263,42 @@ Voleu desar el missatge?</translation>
         <source>Compose</source>
         <translation>Redacta</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Respon al missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Resposta</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Respondre a tothom del missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Respon a tothom</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Reenviar missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Endavant</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Esborra el missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Esborrar</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Imprimir el missatge seleccionat</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14214,7 +15377,7 @@ Voleu desar el missatge?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Missatge nou</translation>
     </message>
@@ -14224,16 +15387,60 @@ Voleu desar el missatge?</translation>
         <translation>Redacta</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Respon al missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Resposta</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Respon a tothom del missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Respon a tothom</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Reenviar missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Reenvia</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Esborra el missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Esborrar</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Imprimir el missatge seleccionat</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Impressió</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Mostra</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Etiquetes</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Safata d&apos;entrada</translation>
@@ -14263,17 +15470,21 @@ Voleu desar el missatge?</translation>
         <translation>Paperera</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Total safata d&apos;entrada:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Carpetes</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Vista ràpida</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Impressió...</translation>
@@ -14283,6 +15494,26 @@ Voleu desar el missatge?</translation>
         <source>Print Preview</source>
         <translation>Prèvia d&apos;impressió</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Botons: Només icona</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Botons: Text al costat de la icona</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Botons: amb text</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Botons: Text sota la icona</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Establir text sota la icona</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14304,7 +15535,7 @@ Voleu desar el missatge?</translation>
         <translation>Reenviar missatge</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Assumpte</translation>
     </message>
@@ -14314,7 +15545,7 @@ Voleu desar el missatge?</translation>
         <translation>Des de</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
@@ -14324,7 +15555,39 @@ Voleu desar el missatge?</translation>
         <translation>Contingut</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Clica per ordenar pels fitxers adjunts</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Clica per ordenar per assumptes</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Clica per ordenar per llegits</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Clica per ordenar pel remitent</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Clica per ordenar per data</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Clica per ordenar per etiquetes</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Clica per ordenar per marcats</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Reenviar missatge seleccionat</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Assumpte de la cerca</translation>
     </message>
@@ -14333,11 +15596,6 @@ Voleu desar el missatge?</translation>
         <source>Search From</source>
         <translation>Cerca de</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14364,14 +15622,14 @@ Voleu desar el missatge?</translation>
         <translation>Cerca adjunts</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Missatges&lt;/h1&gt; &lt;p&gt;Retroshare té el seu propi sistema de correu electrònic. Pots enviar/rebre correus de/a els nodes dels teus amics.&lt;/p&gt; &lt;p&gt;També és possible enviar missatges a identitats d&apos;altra gent utilitzant el sistema de encaminament global. Aquests missatges són sempre encriptats i reenviats per nodes intermediaris fins que arriben al seu destí. &lt;/p&gt; &lt;p&gt;Els missatges distants es queden a la teva bustia de sortints fins que no es rep confirmació d&apos;entrega.&lt;/p&gt; &lt;p&gt;Generalment s&apos;envien missatges per recomanar arxius a amics enviant els enllaços, recomanar nodes d&apos;amics a altres amics, per millorar la teva xarxa, o respostes a propietaris de canals.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Marcat</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14445,7 +15703,7 @@ Voleu desar el missatge?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14459,7 +15717,7 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14474,33 +15732,38 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Esborranys</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>A</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">No hi ha missatges marcats. Les marques et permeten donar als missatges un estat especial per trobar-los fàcilment. Per marcar un missatge clica a l&apos;estrella gris al costat del missatge.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">No hi ha missatges de sistema disponibles.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">A</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Clica per ordenar per destinatari</translation>
+    </message>
+    <message>
+        <source>This message goes to a distant person.</source>
+        <translation type="vanished">Aquest missatge va cap a una persona distant.</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14508,6 +15771,26 @@ Voleu desar el missatge?</translation>
         <source>Total:</source>
         <translation>Total:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Missatges</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Clica per ordenar per signatura</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Aquest missatge és firmat i la signatura vàlida</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Aquest missatge està signat però la signatura no és vàlida</translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">Aquest missatge prové d&apos;una persona distant.</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14535,17 +15818,7 @@ Voleu desar el missatge?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">Desar imatge</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Enganxa com a text pla</translation>
     </message>
@@ -14599,7 +15872,7 @@ Voleu desar el missatge?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -14609,7 +15882,7 @@ Voleu desar el missatge?</translation>
         <translation>Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation>des de</translation>
     </message>
@@ -14644,10 +15917,18 @@ Voleu desar el missatge?</translation>
         <translation>Msg pendent</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
+    <message>
+        <source>Send invite?</source>
+        <translation type="vanished">Enviar invitació?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Estàs segur de voler enviar una invitació amb el teu certificat?</translation>
+    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -14785,7 +16066,7 @@ Voleu desar el missatge?</translation>
         <translation>ID del contacte</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Eliminar claus no utilitzades...</translation>
     </message>
@@ -14795,7 +16076,7 @@ Voleu desar el missatge?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Neteja el clauer</translation>
     </message>
@@ -14812,13 +16093,7 @@ Notes: Es guardarà una copia de seguretat del teu clauer antic.
 L&apos;eliminació potser falli si tens múltiples instancies de RetroShare a la mateixa màquina.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Informació del clauer</translation>
@@ -14853,13 +16128,18 @@ Per seguretat, s&apos;ha fet una copia de seguretat del teu clauer
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Inconsistència de dades al clauer. Això és probablement un &quot;bug&quot;. Si us plau, contacta amb els desenvolupadors.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>Exporta/Crea un node nou</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Només claus de confiança</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Cercar nom</translation>
     </message>
@@ -14869,12 +16149,12 @@ Per seguretat, s&apos;ha fet una copia de seguretat del teu clauer
         <translation>Cerca Id contacte</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>Detalls del perfil...</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14883,6 +16163,13 @@ Reported error:</source>
 Error reportat:</translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Xarxa</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14909,7 +16196,7 @@ Error reportat:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14930,7 +16217,7 @@ Error reportat:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Grups</translation>
     </message>
@@ -14960,19 +16247,19 @@ Error reportat:</translation>
         <translation type="unfinished">importar la teva llista d&apos;amics, incloent els grups</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished">ID cerca</translation>
     </message>
@@ -14982,12 +16269,12 @@ Error reportat:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished">Mostrar elements</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14997,7 +16284,7 @@ Error reportat:</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Grup</translation>
     </message>
@@ -15112,7 +16399,7 @@ Error reportat:</translation>
         <translation type="unfinished">Contreure tot</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Voleu suprimir aquest node?</translation>
     </message>
@@ -15122,7 +16409,7 @@ Error reportat:</translation>
         <translation type="unfinished">Voleu suprimir aquest amic?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Fet!</translation>
@@ -15236,7 +16523,11 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">Entrades en el registre</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15251,7 +16542,11 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Suprimeix-ho tot</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Això és un test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>El més nou a dalt</translation>
     </message>
@@ -15261,12 +16556,21 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>El més vell a dalt</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Novetats&lt;/h1&gt;
+&lt;p&gt;La font de noticies mostra els últims esdeveniments a la xarxa ordenats per hora de recepció. Això et proporciona un resum de l&apos;activitat dels teus amics. Pots triar quins esdeveniments es mostren a &lt;b&gt;Opcions&lt;/b&gt;. &lt;/p&gt; &lt;p&gt;Els esdeveniments mostrats són: &lt;ul&gt; &lt;li&gt;Intents de connexió (útil per fer amics amb gent nova i controlar qui està intentant connectar-te)&lt;/li&gt; &lt;li&gt;Publicacions a canals i fòrums&lt;/li&gt; &lt;li&gt;Nous canals i fòrums als que et pots subscriure&lt;/li&gt; &lt;li&gt;Missatges privats dels teus amics&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="vanished">Registre</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15321,6 +16625,10 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Blogs</source>
         <translation>Blocs</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Seguretat</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15342,6 +16650,10 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Message</source>
         <translation>Missatge</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Intent de connexió</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15358,6 +16670,10 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Ip security</source>
         <translation>Seguretat Ip</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">Registre</translation>
+    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -15368,6 +16684,10 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Enllaços</translation>
+    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -15420,6 +16740,26 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Chat rooms</source>
         <translation>Sales de xat</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">Sales de xat</translation>
+    </message>
+    <message>
+        <source>Count occurrences of my current identity</source>
+        <translation type="vanished">Comptar quants cops hi ha la meva identitat actual</translation>
+    </message>
+    <message>
+        <source>Count occurrences of any of the following texts (separate by newlines):</source>
+        <translation type="vanished">Comptar coincidències de qualsevol dels texts següents (un per línia):</translation>
+    </message>
+    <message>
+        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
+        <translation type="vanished">Marca&apos;l si identitats i texts a la part superior han de coincidir en majúscules/minúscules pel comptador.</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="vanished">Diferenciar majúscules/minúscules</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15496,16 +16836,24 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Deshabilitar notificacions temporalment</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Font</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Àrea de notificació</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">Comptar tots els missatges no llegits</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation>Es requereix contrasenya</translation>
     </message>
@@ -15525,12 +16873,12 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Contrasenya incorrecta !</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Si us plau, introdueix la contrasenya del Retroshare</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Complement/Executable no registrat</translation>
     </message>
@@ -15545,7 +16893,19 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
         <translation>Si us plau, comprova l&apos;hora del sistema.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Examinant arxius compartits...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Calculant número de hash</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Desant índex de l&apos;arxiu...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15556,19 +16916,17 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Títol desconegut</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Missatge encriptat</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Perquè aquestes sales de xat funcionin l&apos;hora en el teu ordinador ha de ser correcta. Si us plau, comprova que és el cas (És possible que una variació de varis minuts s&apos;hagi detectat respecte els teus amics).</translation>
     </message>
@@ -15576,7 +16934,7 @@ com a mínim un dels contactes no s&apos;ha afegit a un grup</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Amic en línia</translation>
     </message>
@@ -15628,6 +16986,10 @@ Tràfic baix: 10 %s del tràfic estàndard i PENDENT: posar en pausa totes les t
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Diàleg</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15693,6 +17055,10 @@ Tràfic baix: 10 %s del tràfic estàndard i PENDENT: posar en pausa totes les t
         <source>This profile has signed your own profile key</source>
         <translation>Aquest perfil ha signat la clau del teu perfil</translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Signatures de la clau :</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15722,20 +17088,23 @@ p, li { white-space: pre-wrap; }
         <translation>Clau PGP</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation>Aquestes opcions s&apos;apliquen a tots els nodes del perfil:</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signar la clau d&apos;un amic és una forma d&apos;expressar la teva confiança en aquest amic als teus altres amics. Els ajudarà a decidir si volen acceptar o no connexions d&apos;aquesta clau basant-se en la teva confiança. Signar una clau és completament opcional i no es pot desfer, fes-ho amb cura.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Signa clau PGP</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15772,7 +17141,12 @@ p, li { white-space: pre-wrap; }
         <translation>Inclou les signatures</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Opcions</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;El RetroShare periòdicament comprova la teva llista d&apos;amics per arxius navegables que coincideixin amb els mateixos que estàs descarregant, per establir una transferència directa. En aquest cas els teus amics sabran què descarregues.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Si no vols que això passi per algun amic en concret, desmarca aquesta casella. Encara podràs realitzar transferències directes si ho demanes explícitament, per exemple descarregant de la llista del teu amic directament. Això s&apos;aplicarà a totes les ubicacions del mateix node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -15786,6 +17160,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquesta opció et permet descarregar automàticament un arxiu recomanat en un missatge que provingui d&apos;aquest node. Això es pot utilitzar per exemple per enviar arxius entre els teus nodes. S&apos;aplica a totes les ubicacions del mateix node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15818,21 +17196,21 @@ p, li { white-space: pre-wrap; }
         <translation>kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: no es poden obtenir detalls del contacte.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>L&apos;algorisme de la clau proporcionada no és suportada pel RetroShare
@@ -15853,7 +17231,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega directa com No.</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>El nivell de confiança és una forma d&apos;expressar la teva confiança en aquesta clau. No s&apos;utilitza pel programa ni es comparteix, però et pot ser útil per recordar claus bones/dolentes.</translation>
     </message>
@@ -15922,6 +17300,10 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Potser la contrasenya sigui incorrecta</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15929,12 +17311,12 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>Perfil de Retroshare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Aquesta és la teva clau PGP i està signada per :</translation>
     </message>
@@ -15960,7 +17342,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Xat</translation>
     </message>
@@ -15981,7 +17363,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Nom:</translation>
     </message>
@@ -16021,7 +17403,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>Diferencia de temps:</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Escriure missatge</translation>
     </message>
@@ -16035,6 +17417,10 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>Friend Connected</source>
         <translation>Amic connectat</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Intent de connexió</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16073,13 +17459,17 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>Unknown</source>
         <translation type="unfinished">Desconegut</translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Contacte desconegut</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Enviar missatge</translation>
     </message>
@@ -16131,6 +17521,10 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>Chat with this person as...</source>
         <translation>Xat amb aquesta persona com...</translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">Enviar un missatge a aquesta persona</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -16189,6 +17583,10 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Qualsevol de la teva llista de contactes tindrà automàticament una opinió positiva, si no ho canvies. Això permet que la reputació dels nodes en ús tinguin millor reputació.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
+        <translation type="vanished">donar automàticament una opinió &quot;Positiva&quot; als meus contactes</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -16246,6 +17644,13 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Per tal d&apos;evitar que identitats expulsades esborrades tornin perquè estan sent usades a fòrums o canals, se les manté en una llista durant un temps. Si després d&apos;aquest temps, s&apos;esborren de la llista però continuen sent usades, tornaran a propagar-se per fòrums, sales de xat, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulari</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16253,11 +17658,23 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Foto</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>EtiquetaTexte</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Comentari</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Resum</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16266,7 +17683,7 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
     <message>
         <location line="+99"/>
         <source>Details</source>
-        <translation type="unfinished">Detalls</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
@@ -16318,6 +17735,14 @@ Avís: En les opcions de Transferència d&apos;arxius, has marcat descarrega dir
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Afegir comentari</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Escriure un comentari...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16388,6 +17813,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Crear àlbum</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Veure àlbum</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16409,17 +17838,17 @@ p, li { white-space: pre-wrap; }
         <translation>Presentació de diapositives</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Els meus àlbums</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Àlbums subscrits</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Àlbums compartits</translation>
     </message>
@@ -16449,7 +17878,7 @@ abans de demanar editar-lo!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Nom d&apos;àlbum</translation>
     </message>
@@ -16508,19 +17937,19 @@ abans de demanar editar-lo!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16556,12 +17985,12 @@ abans de demanar editar-lo!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>EtiquetaTexte</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Mostra més detalls sobre aquest complement</translation>
     </message>
@@ -16707,6 +18136,61 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Directoris on buscar complements</translation>
     </message>
+    <message>
+        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
+        <translation type="vanished">Complement deshabilitat. Clica el botó d&apos;activació o reinicia el Retroshare</translation>
+    </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[desactivat]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">No s&apos;ha proporcionat número d&apos;API. Si us plau, llegeix el manual de desenvolupament de complements.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[problema de carrega]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">No s&apos;ha proporcionat número d&apos;SVN. Si us plau, llegeix el manual de desenvolupament de complements.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Error carregant.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Falten símbols. Versió equivocada?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Sense objecte del complement</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Complement carregat.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Estat desconegut.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Activa pels complements en desenvolupament.
+No se&apos;ls comprovarà el hash. No obstant, en 
+circumstancies normals, comprovar el hash et
+protegeix de l&apos;acció maliciosa de complements 
+modificats.</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Complements&lt;/h1&gt; &lt;p&gt;Els complements es carreguen dels directoris del llistat inferior.&lt;/p&gt; &lt;p&gt; Per raons de seguretat, els complements acceptats es carreguen automàticament mentre l&apos;executable principal del Retroshare o els complements no canviïn. En tal cas, l&apos;usuari haurà de confirmar-ho altre cop. Un cop el programa s&apos;ha iniciat, pots habilitar un complement manualment fent clic al botó &quot;Activa&quot; i després reiniciant el Retroshare.&lt;/p&gt; &lt;p&gt;Si vols desenvolupar els teus propis complements contacta amb els desenvolupadors i estaran contents d&apos;ajudar-te!&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16776,27 +18260,12 @@ p, li { white-space: pre-wrap; }
         <translation>Posar la finestra per damunt</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">Expulsa aquesta persona (Emet una opinió negativa)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished">Opinió neutre</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished">Opinió positiva</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16830,6 +18299,22 @@ p, li { white-space: pre-wrap; }
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The person you are talking to has deleted the secured chat tunnel.</source>
+        <translation type="vanished">La persona amb qui estaves parlant ha esborrat el túnel de xat segur.</translation>
+    </message>
+    <message>
+        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
+        <translation type="vanished">El company de xat ha esborrat el túnel segur, els missatges s&apos;entregaran el més aviat possible.</translation>
+    </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Tancar aquesta finestra finalitzarà la conversa, notifica-ho al contacte i esborra el túnel encriptat.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Matar el túnel?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16849,7 +18334,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nou</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positiu</translation>
     </message>
@@ -16869,8 +18354,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Comentaris</translation>
     </message>
@@ -16895,13 +18380,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Comentari</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished">Comentaris</translation>
     </message>
@@ -16929,12 +18414,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Signat per:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Notes</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16949,22 +18442,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Carrega arxiu d&apos;imatge</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16980,17 +18463,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17000,7 +18473,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Publica entrada</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">Estàs enviant un enllaç. La clau per a que tingui èxit és un contingut interessant i un títol descriptiu.</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Publica</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Publica una entrada nova</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Si us plau, afegeix un títol</translation>
     </message>
@@ -17020,22 +18509,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17050,7 +18529,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Publica com</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17061,7 +18540,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Imatge</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17071,7 +18550,7 @@ p, li { white-space: pre-wrap; }
         <translation>Títol</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Enllaç</translation>
     </message>
@@ -17079,12 +18558,44 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Enllaços publicats</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Publicacions&lt;/h1&gt; &lt;p&gt;El servei de publicacions et permet compartir enllaços d&apos;Internet que es distribueixen entre els nodes de Retroshare com si fos un fòrum o 	 canal&lt;/p&gt; 	 &lt;p&gt;Els enllaços poden ser comentats pels usuaris subscrits. També hi ha un sistema de promoció que permet  	 destacar enllaços importants.&lt;/p&gt; 	 &lt;p&gt;No hi ha cap restricció en quins enllaços es comparteixen. Sigues curós al fer clic en ells.&lt;/p&gt; &lt;p&gt;Els enllaços publicats es mantenen durant %1 dies i es sincronitzen durant els últims %2 dies, a no ser que ho canviïs.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Crear tema</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Els meus temes</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Temes subscrits</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Temes populars</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Altres temes</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Enllaços</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17118,7 +18629,31 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Tema publicat</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Afegir administradors de tema</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Seleccionar administradors de tema</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Crear nou tema</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Editar tema</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Actualitzar tema</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17156,17 +18691,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>Subscriure&apos;s als publicats</translation>
     </message>
@@ -17182,7 +18707,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -17197,17 +18722,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">Descripció dels publicats</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Carregant</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">Publicats nous</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">Mai</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17220,18 +18752,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Lloc</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Comentaris</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
@@ -17242,12 +18778,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Comentari</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished">Comentaris</translation>
     </message>
@@ -17257,7 +18793,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L&apos;autor d&apos;aquest missatge (amb Id %1) està expulsat.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17267,17 +18803,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Votar positiu</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Votar negatiu</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Marcar com llegit i eliminar l&apos;element</translation>
     </message>
@@ -17287,7 +18827,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nou</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Nou comentari:</translation>
     </message>
@@ -17297,7 +18837,7 @@ p, li { white-space: pre-wrap; }
         <translation>Valor del comentari</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -17338,10 +18878,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Carregant</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Per</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulari</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Calent</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nou</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Capdamunt</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Avui</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Ahir</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Aquesta setmana</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Aquest mes</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Aquest any</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Publica una entrada nova</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Següent</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Si us plau, crea o escull una Id signant abans de votar</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Previ</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17353,7 +18960,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+13"/>
         <source>Details</source>
-        <translation type="unfinished">Detalls</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
@@ -17361,17 +18968,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17381,15 +18978,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Administrador:</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">desconegut</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished">Distribució:</translation>
     </message>
@@ -17399,42 +18996,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">Publicacions</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17454,7 +19051,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Calent</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17484,17 +19081,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17509,17 +19106,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Buit</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17529,31 +19121,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished">informació</translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17568,7 +19156,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Subscriure&apos;s</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">Mai</translation>
     </message>
@@ -17642,16 +19230,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">No hi ha canal seleccionat</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17660,6 +19238,14 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Pestanyes</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Obrir cada tema en una nova pestanya</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Enllaços</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17673,6 +19259,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Enviat</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17741,17 +19331,25 @@ p, li { white-space: pre-wrap; }
         <translation>Directori de perfils</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&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;
+&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;Ubuntu&apos;; font-size:11pt; 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;Selecciona una clau de node de RetroShare de la llista inferior per ser utilitzada en un altre ordinador, i prem &amp;quot;Exportar clau seleccionada.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Per crear una nova ubicació en un altre ordinador, selecciona el gestor de identitats en el diàleg d&apos;entrada. Des d&apos;allà podràs importar l&apos;arxiu de clau i crear una nova ubicació per aquella clau.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Crear un node nou amb la mateixa clau fa que els nodes dels teus amics acceptin el nou node automàticament.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -17861,7 +19459,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Editar missatge d&apos;estat</translation>
@@ -17877,7 +19475,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>Directori de perfils</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Informació pública</translation>
     </message>
@@ -17912,12 +19510,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation>En línia des de:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Altra informació</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>La meva adreça</translation>
     </message>
@@ -17961,27 +19559,51 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Entrada de:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Compte 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Compte 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Compte 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Afegir al Pols</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">filtre</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">Afegidor d&apos;URL</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Mostra com</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17991,12 +19613,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished">De:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18026,13 +19648,13 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished">Negatiu</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18044,22 +19666,12 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18068,13 +19680,17 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Publica Pols a Wire</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18089,24 +19705,34 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Carrega arxiu d&apos;imatge</translation>
+        <source>From</source>
+        <translation type="vanished">Des de</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Data</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18117,7 +19743,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished">Formulari</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18136,7 +19762,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18146,7 +19772,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18173,7 +19799,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18183,7 +19809,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18203,7 +19829,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18319,7 +19945,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18327,42 +19953,37 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18394,7 +20015,7 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18402,8 +20023,8 @@ i utilitzar el botó d&apos;importació per carregar-lo</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Confirmació</translation>
     </message>
@@ -18674,12 +20295,12 @@ Els caràcters &lt;b&gt;&quot;,|,/,\,&amp;lt;&amp;gt;,*,?&lt;/b&gt; es substitui
         <translation>Detalls del contacte</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Petició d&apos;arxiu cancel·lada</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Aquesta versió de RetroShare utilitza l&apos;OpenPGP-SDK. Com a efecte secundari no utilitza el clauer PGP del sistema, sinó un clauer compartit per totes les instancies de RetroShare. &lt;br&gt;&lt;br&gt;No sembla que tinguis aquest clauer, tot i que tens claus PGP als comptes existents de RetroShare, probablement perquè acabes de canviar a aquesta nova versió del programa.</translation>
     </message>
@@ -18710,7 +20331,7 @@ Els caràcters &lt;b&gt;&quot;,|,/,\,&amp;lt;&amp;gt;,*,?&lt;/b&gt; es substitui
         <translation>S&apos;ha produït un error inesperat. Si us plau, informa &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation>No es pot iniciar &quot;Tor Manager&quot;!</translation>
     </message>
@@ -18748,7 +20369,7 @@ L&apos;error reportat és:&quot;</translation>
         <translation>No ha estat possible iniciar un servei ocult.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Múltiples instancies</translation>
@@ -18769,26 +20390,6 @@ Arxiu bloquejant:\n</translation>
         <translation>Hi ha hagut un error inesperat quan el RetroShare intentava obtenir el bloqueig d&apos;instància única
 Arxiu de bloqueig:\n</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18809,6 +20410,14 @@ Arxiu de bloqueig:\n</translation>
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
+        <translation type="vanished">Túnel pendent... Els missatges s&apos;entregaran el més aviat possible</translation>
+    </message>
+    <message>
+        <source>Secured tunnel is working. Messages are delivered immediately!</source>
+        <translation type="vanished">Túnel segur establert. Els missatges s&apos;entregaran immediatament!</translation>
+    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -18871,7 +20480,7 @@ L&apos;error reportat és:
         <translation>Dades reenviades</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Sembla que tens nodes associats a claus DSA:</translation>
     </message>
@@ -18881,7 +20490,7 @@ L&apos;error reportat és:
         <translation>Les claus DSA encara no són suportades en aquesta versió de RetroShare. Tots aquests nodes no es podran utilitzar. Ho sentim molt.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>activat</translation>
     </message>
@@ -18891,7 +20500,7 @@ L&apos;error reportat és:
         <translation>desactivat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Mou la IP %1 a la llista blanca</translation>
     </message>
@@ -18907,7 +20516,7 @@ L&apos;error reportat és:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>fa %1 segons</translation>
     </message>
@@ -18975,7 +20584,7 @@ Security: no anonymous IDs</source>
 Seguretat: IDs anònimes no</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation>Afegeix-te a la sala de xat</translation>
     </message>
@@ -19003,7 +20612,7 @@ Seguretat: IDs anònimes no</translation>
         <translation>no s&apos;ha pogut interpretar l&apos;arxiu XML!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation>Indefinidament</translation>
     </message>
@@ -19183,29 +20792,13 @@ Seguretat: IDs anònimes no</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Nom</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Node</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished">Adreça</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Estat</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19398,6 +20991,10 @@ Seguretat: IDs anònimes no</translation>
         <source>Click to resume the hashing process</source>
         <translation>Clica per continuar amb el càlcul de hash</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Aquest certificat conté:</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19448,18 +21045,6 @@ Seguretat: IDs anònimes no</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19622,7 +21207,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Tota la xarxa</translation>
     </message>
@@ -19805,7 +21390,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>La càrrega d&apos;imatges incrustades està bloquejada.</translation>
     </message>
@@ -19818,7 +21403,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Permès per defecte</translation>
     </message>
@@ -19991,22 +21576,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">Desar imatge</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20014,12 +21589,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation>Opcions de la vista d&apos;arbre</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20049,6 +21624,14 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">Mostrar columna...</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[sense títol]</translation>
+    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -20711,7 +22294,7 @@ Si creus que és correcta, treu la línia corresponent de l&apos;arxiu i torna&a
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nom</translation>
@@ -20832,7 +22415,7 @@ Si creus que és correcta, treu la línia corresponent de l&apos;arxiu i torna&a
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -20852,7 +22435,7 @@ Si creus que és correcta, treu la línia corresponent de l&apos;arxiu i torna&a
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20908,7 +22491,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished">El missatge es propagarà als teus amics.</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Missatge modificat ... ]</translation>
     </message>
@@ -20922,6 +22505,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[Desconegut]</translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Missatge perdut ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20935,11 +22523,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Des de</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished">A</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20962,18 +22545,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Clica per ordenar per llegits</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Clica per ordenar pel remitent</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20996,9 +22574,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21019,7 +22595,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Reinicialitza TOTS les valors de configuració del RetroShare.</translation>
     </message>
@@ -21080,7 +22656,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Defineix la llengua del RetroShare.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Incapaç d&apos;obrir l&apos;arxiu de registre &apos;%1&apos;: %2</translation>
     </message>
@@ -21101,7 +22677,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation>No s&apos;ha pogut crear el directori de dades: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Revisió</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation>ModeOp</translation>
     </message>
@@ -21131,7 +22711,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Informació d&apos;ús de la IGU de RetroShare</translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>El codi d&apos;idioma especificat no és vàlid: </translation>
     </message>
@@ -21149,7 +22729,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Error d&apos;accés al registre. Potser necessitis drets d&apos;administrador.</translation>
@@ -21166,12 +22746,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Inserir una paraula clau aquí (com a mínim 3 caràcters de longitud)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Iniciar cerca</translation>
     </message>
@@ -21233,7 +22813,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Neteja</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Paraules Clau</translation>
     </message>
@@ -21248,7 +22828,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Id cerca</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Nom d&apos;arxiu</translation>
     </message>
@@ -21348,23 +22928,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Descarregar seleccionats</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Nom d&apos;arxiu</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Descarregar</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Copia l&apos;enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Enviar enllaç RetroShare</translation>
     </message>
@@ -21374,7 +22954,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Avís de descarrega</translation>
     </message>
@@ -21411,7 +22991,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Suprimeix-ho tot</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Directori</translation>
@@ -21422,17 +23002,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Enllaç(os) RetroShare nou(s)</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Obrir directori</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Crear col·lecció...</translation>
     </message>
@@ -21452,7 +23032,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Descarregar d&apos;arxiu de col·lecció...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Col·lecció</translation>
     </message>
@@ -21460,7 +23040,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Detalls del contacte</translation>
     </message>
@@ -21476,22 +23056,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Eliminar l&apos;element</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>Adreça IP:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>ID del contacte:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Ubicació:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Nom del contacte:</translation>
     </message>
@@ -21508,7 +23088,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Amagar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation>però reportat:</translation>
     </message>
@@ -21533,8 +23113,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Aquesta és la IP que el teu amic diu estar connectat. Si just has canviat d&apos;IP això és un fals avís. Si no, significa que la teva connexió amb aquest amic està sent encaminada per un contacte intermig, que seria sospitós.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquest avís apareix per protegir-te contra atacs de reenviament. En tal cas, l&apos;amic amb qui estàs connectat veurà la IP de l&apos;atacant, no la teva IP externa.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;No obstant, si acabes de canviar la teva IP per qualsevol motiu (alguns proveïdors forcen el canvi d&apos;IP regularment) aquest avís només t&apos;indica que t&apos;has connectat amb el teu amic abans que el RetroShare hagi notat el canvi d&apos;IP. Res malament en tal cas.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Pots evitar fàcilment els falsos avisos afegint a la llista blanca les teves IPs (Ex.:El rang d&apos;IPs del teu proveïdor) o deshabilitant completament aquests avisos a Opcions-&amp;gt;Notificar-&amp;gt;Novetats.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -21542,7 +23122,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>vol ser amic teu al RetroShare</translation>
     </message>
@@ -21573,7 +23153,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Ampliar</translation>
     </message>
@@ -21618,12 +23198,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Estat:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Escriure missatge</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Intent de connexió</translation>
     </message>
@@ -21643,22 +23223,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Intent de connexió (Sortint) desconegut</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Problema de seguretat desconegut</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">Desconegut</translation>
     </message>
@@ -21668,7 +23243,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Contacte desconegut</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Amagar</translation>
     </message>
@@ -21678,7 +23257,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Voleu suprimir aquest amic?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>El certificat té una signatura incorrecta!! Aquest contacte no és qui diu ser.</translation>
     </message>
@@ -21688,12 +23267,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Certificat perdut/danyat. No és un usuari de RetroShare.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>El certificat a provocat un error intern.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>El contacte/node no és a la llista d&apos;amics (Id PGP=</translation>
     </message>
@@ -21752,12 +23331,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Adreça local</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -21778,22 +23357,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Xarxa local</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Cercador d&apos;adreça IP externa</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Conegudes / IPs previes:</translation>
     </message>
@@ -21809,16 +23388,21 @@ connectar-te quan tens pocs amics. També ajuda si estàs darrera
 d&apos;un tallafocs o una VPN.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Permet que el RetroShare pregunti la meva IP a aquests llocs web:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>El rang de ports acceptats va de 10 fins 65535. Normalment els ports per sota 1024 estan reservats pel teu sistema.</translation>
     </message>
@@ -21828,46 +23412,23 @@ d&apos;un tallafocs o una VPN.</translation>
         <translation>El rang de ports acceptables va de 1024 a 65535. Els ports per sota 1024 estan reservats pel teu sistema.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Adreça Onion</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Descobriment activat (Recomanat)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>S&apos;ha configurat Tor automàticament per part de Retroshare. No hauria de fer falta que canviessis res aquí.</translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Descobriment desactivat</translation>
     </message>
@@ -21877,7 +23438,7 @@ List of found external IP:
         <translation>Ocult - Mira la configuració</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>Adreça I2P</translation>
     </message>
@@ -21902,95 +23463,41 @@ List of found external IP:
         <translation>Entrants correctes</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>El repetidor sembla que funciona</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>El repetidor I2P no està activat</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
+        <translation>BOB està en funcionament i accessible</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
-        <translation type="unfinished"></translation>
+        <source>BOB is not accessible! Is it running?</source>
+        <translation>No es pot accedir a BOB! Està en funcionament?</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare utilitza BOB per establir a %1 túnel a %2:%3 (anomenat %4)
+
+Quan es canvien opcions (per exemple el port) utilitza els botons inferiors per reiniciar BOB.
+
+</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation>client</translation>
     </message>
@@ -22005,7 +23512,73 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>desconegut</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation>BOB està processant una petició</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation>comprovació de connectivitat</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation>generant clau</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation>iniciant</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation>apagant</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation>BOB està processant una petició: %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation>BOB està trencat
+</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation>BOB ha trobat un error:
+</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation>El túnel BOB està funcionant</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation>BOB funciona correctament: túnel establert</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation>El túnel BOB no està funcionant</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation>BOB és inactiu: túnel tancat</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation>demana una clau nova de servidor</translation>
     </message>
@@ -22015,7 +23588,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>carrega una clau de servidor de base64</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation>para el túnel BOB per generar abans una clau nova</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation>Para túnel BOB abans per carregar una clau</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation>para el túnel BOB abans per desactivar BOB</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Se&apos;t pot contactar a través d&apos;un servei ocult.</translation>
     </message>
@@ -22029,12 +23617,12 @@ Estan tots els serveis funcionant correctament??
 Comprova els teus ports!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Node ocult]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Això buida la llista d&apos;adreces conegudes. Això és útil si per alguna rao la teva llista d&apos;adreces conté una adreça invàlida/irrellevant/caducada que vols evitar passar als teus amics com una adreça de contacte.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22044,7 +23632,7 @@ Comprova els teus ports!</translation>
         <translation>Neteja</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>Límit de baixada (KiB/s)</translation>
     </message>
@@ -22059,24 +23647,24 @@ Comprova els teus ports!</translation>
         <translation>Límit de pujada (KiB/s)</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El límit de pujada afecta a tota l&apos;aplicació. Un límit de pujada massa baix pot bloquejar eventualment serveis de baixa prioritat (Fòrums, canals). El valor mínim recomanat és de 50 KiB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation>AVÍS:
 Aquests valors no tenen en compte els Repetidors.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22093,7 +23681,17 @@ Ara introdueix l&apos;adreça (e.g. 127.0.0.1) i el port que has escullit abans
 Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, així que perquè no configurar Tor i/o I2P?</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation>I2P/BOB automàtic</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation>Activa I2P BOB - canviar això necessita que reiniciïs per tindre efecte</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation>activar opcions avançades</translation>
     </message>
@@ -22103,7 +23701,12 @@ Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, aix
         <translation>mode avançat</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation>Pont Obert I2P Bàsic</translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation>Adreça instancia I2P</translation>
     </message>
@@ -22113,7 +23716,17 @@ Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, aix
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation>Port del proxy I2P</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation>BOB accessible</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation>Adreça</translation>
     </message>
@@ -22153,7 +23766,7 @@ Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, aix
         <translation>carrega clau</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation>Començar</translation>
     </message>
@@ -22168,7 +23781,12 @@ Pots connectar-te a nodes ocults, encara que estiguis en un node estàndard, aix
         <translation>Atura</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation>Estat del BOB</translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation>Entrants</translation>
     </message>
@@ -22216,32 +23834,7 @@ Finalment assegurat que els ports coincideixen amb la configuració.
 Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation>Repetidor</translation>
     </message>
@@ -22296,7 +23889,7 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Total:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation>Avís: Aquest ample de banda es sumarà a l&apos;ample de banda màxim.</translation>
     </message>
@@ -22321,7 +23914,7 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Eliminar servidor</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22335,7 +23928,7 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Xarxa</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>Filtres IP</translation>
     </message>
@@ -22358,7 +23951,7 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Estat</translation>
     </message>
@@ -22418,28 +24011,17 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Afegir a la llista blanca</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Configuració dels serveis ocults</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;/p&gt;Aquest és el port cap al repetidor Socks de Tor. El teu node de Retroshare pot utilitzar-lo per connectar a&lt;/p&gt;&lt;p&gt;nodes Ocults. El llum de la dreta es tornarà verd quan el port estigui actiu en el teu ordinador.&lt;/p&gt;&lt;p&gt;Això no significa que el transit del teu Retroshare vagi per Tor. Només ho farà si &lt;/p&gt;&lt;p&gt;connectes contra nodes Ocults o estàs corrent un node Ocult tu mateix.&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El llum de l&apos;esquerra serà verd quan el port d&apos;entrada estigui actiu en el teu ordinador. No indica&lt;/p&gt;&lt;p&gt;que el teu transit de Retroshare vagi per Tor. Només ho farà si&lt;/p&gt;&lt;p&gt;et connectes a nodes Ocults, o si estàs corrent un node ocult tu mateix.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22455,18 +24037,18 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El llum de l&apos;esquerra serà verd quan el port d&apos;entrada estigui actiu en el teu ordinador. No indica&lt;/p&gt;&lt;p&gt;que el teu transit de Retroshare vagi per I2P. Només ho farà si&lt;/p&gt;&lt;p&gt;et connectes a nodes Ocults, o si estàs corrent un node ocult tu mateix.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>Sortints I2P correctes</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Adreça del servei</translation>
     </message>
@@ -22501,12 +24083,12 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Si us plau, escriu una adreça de servei</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>Rang IP</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Anunciat per DHT per enmascarament IP</translation>
     </message>
@@ -22529,12 +24111,12 @@ Si tens problemes connectant-te sobre Tor comprova també els registres de Tor.<
         <translation>Afegit per tu</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mentre que les IPs llistades s&apos;obtenen de les fonts següents: IPs d&apos;un certificat intercanviat manualment, rangs d&apos;IPs introduïts per tu en aquesta finestra o en els elements de seguretat de novetats&lt;/p&gt;&lt;p&gt;El comportament per defecte del Retroshare és (1) sempre permetre connexions a contactes amb una IP a la llista blanca, encara que també apareguin a la llista negra; (2) opcionalment es pot forçar a que les IPs hagin d&apos;estar a la llista blanca. Pots canviar aquest comportament per cada contacte a la finestra &amp;quot;Detalls&amp;quot; de cada node de Retroshare.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La DHT et permet respondre les peticions 
 de connexió dels teus amics utilitzant el protocol
@@ -22542,12 +24124,12 @@ de connexió dels teus amics utilitzant el protocol
 &lt;/p&gt;&lt;p&gt;El servei de descobriment envia els noms dels nodes i les identitats dels teus contactes de confiança als nodes contactats, per ajudar a que escullin amics nous. No obstant, l&apos;amistat mai és automàtica i els dos contactes encara haurien de confiar entre ells per permetre la connexió. </translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L&apos;indicador es torna verd quan el Retroshare aconsegueix obtindre la teva pròpia IP d&apos;una de les webs llistades, si ho tens activat. El Retroshare intentarà també utilitzar altres mètodes per obtenir la teva IP.</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Aquesta llista s&apos;omple automàticament amb informació recopilada des de múltiples fonts: contactes que fan masquerading anunciats per DHT, rangs d&apos;IP entrats per tu, i rangs d&apos;IP anunciats pels teus amics. La configuració per defecte hauria de protegir-te contra repetidors de tràfic massius.&lt;/p&gt;&lt;p&gt;Detectar automàticament IPs que fan masquerading pot acabar posant IPs amigues a la llista negra. En tal cas, utilitza el menú contextual per afegir-los a la llista blanca.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22582,22 +24164,26 @@ de connexió dels teus amics utilitzant el protocol
         <translation>Expulsa automàticament els rangs d&apos;IP fent reenviament DHT començant a </translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation>Tor/I2P sortint manual</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configura el teu proxy SOCKS per Tor i I2P aquí.&lt;br/&gt;Si prefereixes utilitzar BOB per controlar automàticament l&apos;I2P comprova l&apos;altra pestanya.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Repetidor socks TOR</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Sortints Tor correcte</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>El repetidor Tor no està activat</translation>
     </message>
@@ -22677,7 +24263,7 @@ de connexió dels teus amics utilitzant el protocol
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>comprovar els contactes amb qui t&apos;agradaria compartir les claus de publicació</translation>
     </message>
@@ -22687,12 +24273,12 @@ de connexió dels teus amics utilitzant el protocol
         <translation>Compartit amb els amics</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Compartir</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Pots fer que els teus amics sàpiguen del teu canal compartint-lo amb ells.
@@ -22713,7 +24299,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Directori de directoris compartits</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation>Directori compartit</translation>
     </message>
@@ -22733,17 +24319,17 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Visibilitat</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation>Afegir nou</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Afegeix un directori compartit</translation>
     </message>
@@ -22753,7 +24339,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Treure</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Aplicar i tancar</translation>
     </message>
@@ -22844,7 +24430,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Directori no trobat o nom del directori no acceptat.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Aquesta és una llista dels directoris compartits. Pots afegir-ne i treure&apos;n utilitzant els botons a la part inferior. Quan afegeixes un nou directori inicialment tots els seus arxius es comparteixen. Pots especificar permisos específics per cada directori.</translation>
     </message>
@@ -22852,7 +24438,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Arxius</translation>
     </message>
@@ -22903,16 +24489,11 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>comprovar arxius</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Descarregar seleccionats</translation>
     </message>
@@ -22922,7 +24503,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Descarregar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Copiar enllaç RetroShare al porta-retalls</translation>
     </message>
@@ -22937,7 +24518,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Enviar enllaç RetroShare</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation>Alguns arxius s&apos;han omès</translation>
     </message>
@@ -22953,7 +24534,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Consell(s)</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Crear col·lecció...</translation>
     </message>
@@ -22978,7 +24559,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Descarregar d&apos;arxiu de col·lecció...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Alguns arxius s&apos;han omès perquè encara no han estat indexats.</translation>
     </message>
@@ -23121,12 +24702,12 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Carrega configuració</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Crear interfície</translation>
     </message>
@@ -23150,7 +24731,7 @@ Escull els amics amb qui vols compartir el teu canal.</translation>
         <translation>Recordar contrasenya</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Validar-se</translation>
     </message>
@@ -23507,7 +25088,7 @@ Això es pot canviar a les opcions de configuració.</translation>
         <translation>Missatge d&apos;estat</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Missatge:</translation>
     </message>
@@ -23752,7 +25333,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Eliminar totes les etiquetes</translation>
     </message>
@@ -23788,15 +25369,12 @@ p, li { white-space: pre-wrap; }
         <translation>Configura Tor...</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation>Estat Tor:</translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation>Desconegut</translation>
     </message>
@@ -23806,13 +25384,18 @@ p, li { white-space: pre-wrap; }
         <translation>No iniciat</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
+        <translation>Adreça del servei ocult:</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation>Estat bootstrap de Tor:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation>No configurat</translation>
     </message>
@@ -23822,57 +25405,12 @@ p, li { white-space: pre-wrap; }
         <translation>Adreça Onion:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">No connectat</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation>Comprova que Tor és accessible a les rutes d&apos;executables</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation>[Esperant al Tor...]</translation>
     </message>
@@ -23880,17 +25418,21 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Aquesta versió de Retroshare utilitza Tor per connectar amb els teus amics.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation>Tor és fora de línia</translation>
     </message>
@@ -23901,12 +25443,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Sense configuració Tor</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23934,7 +25475,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Opcions de transferència</translation>
@@ -23945,7 +25486,7 @@ p, li { white-space: pre-wrap; }
         <translation>Màxim de descarregues simultànies:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation>Directoris compartits</translation>
     </message>
@@ -23955,27 +25496,22 @@ p, li { white-space: pre-wrap; }
         <translation>Compartir automàticament directori entrant (recomanat)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation>Editar compartits</translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished">Configura els directoris compartits</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation>Auto-comprova els directoris compartits cada</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation>minut(s)</translation>
     </message>
@@ -24060,7 +25596,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24069,12 +25605,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Màxim de pujades simultànies per amic (0 = il·limitades)</translation>
     </message>
@@ -24099,12 +25630,7 @@ p, li { white-space: pre-wrap; }
         <translation>Permetre descarregues directes:</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>En flux</translation>
     </message>
@@ -24163,13 +25689,38 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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;Retroshare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; és capaç de transferir dades i peticions de cerca entre contactes que no necessàriament siguin amics. No obstant, aquest tràfic només passa entre els amics connectats i és anònima.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;Pots especificar per separat els permisos de compartició per cada directori compartit a la finestra d&apos;arxius compartits:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Navegables pels amics:&lt;/span&gt;: Els arxius són vistos pels teus amics.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Compartits anònimament&lt;/span&gt;: Els arxius es poden descarregar a través de túnels anònims distants.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Màxim de peticions de túnels reenviades per segon:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;En flux&lt;/span&gt;fa que la transferència es faci en fragments de 1 MiB per ordre, facilitant la previsualització mentre es descarrega. &lt;span style=&quot; font-weight:600;&quot;&gt;Aleatori&lt;/span&gt;és completament aleatori i afavoreix el comportament en eixam. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressiu&lt;/span&gt;és un compromís, sol·licitant el proper fragment aleatòriament dins dels propers 50 MiB següents al final de l&apos;arxiu parcial. Això permet aleatorietat i a la vegada evita temps llargs d&apos;inicialització amb els arxius grossos.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El Retroshare pausarà totes les transferències i gravacions de configuració al disc si l&apos;espai lliure queda per sota d&apos;aquest llindar. Això evita la pèrdua d&apos;informació en alguns sistemes. Una finestra de notificació t&apos;avisarà quan això passi.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24181,17 +25732,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
 &lt;/p&gt;&lt;p&gt;El valor per defecte és 20. Si no n&apos;estàs segur, deixa-ho així.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Avís</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation>Establir el directori d&apos;entrants</translation>
     </message>
@@ -24219,7 +25760,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Descarrega completa</translation>
     </message>
@@ -24243,23 +25784,39 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Tens %1 descarregues completes</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Tens %1 descarrega completa</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 descarregues completades</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 descarrega completada</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Descarregues</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Pujades</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nom</translation>
@@ -24466,7 +26023,11 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Especificar...</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Transferència d&apos;arxiu&lt;/h1&gt; &lt;p&gt;Retroshare contempla dues formes de fer això: transferències directes dels teus amics, i transferències distants amb túnels anònims. A més amés, les transferències d&apos;arxius són multi-origen i permet fer-les en eixam (pots ser origen mentre descarregues)&lt;/p&gt; &lt;p&gt;Pots compartir arxius amb &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; la icona de la barra lateral esquerra. Aquests arxius es llistaran a la pestanya els meus arxius. Pots triar per cada grup d&apos;amics si poden o no veure&apos;l a la pestanya arxius d&apos;amics.&lt;/p&gt; &lt;p&gt;La pestanya cerca dona resultats pels arxius del teus amics i arxius que es poden accedir distants anònimament utilitzant el sistema de túnels multi-salt.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Moure a la cua...</translation>
     </message>
@@ -24491,7 +26052,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Escull directori</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Túnel anònim encriptat d&apos;extrem a extrem 0x</translation>
     </message>
@@ -24512,7 +26073,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24545,17 +26106,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>L&apos;arxiu %1 no s&apos;ha completat. Si es un fitxer multimèdia intenta una prèvia.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Avís</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Canviar el nom de l&apos;arxiu</translation>
     </message>
@@ -24570,7 +26121,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Si us plau, introdueix un nou--i vàlid--nom d&apos;arxiu</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Expandeix tot</translation>
@@ -24697,18 +26248,23 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Columnes</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Transferències d&apos;arxius</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
@@ -24718,7 +26274,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Mostra columna de ruta</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>No s&apos;ha pogut esborrar l&apos;arxiu de previsualització</translation>
     </message>
@@ -24728,7 +26284,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Tornar-ho a intentar?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Crear col·lecció...</translation>
     </message>
@@ -24743,12 +26299,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Veure col·lecció...</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+193"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Col·lecció</translation>
     </message>
@@ -24758,7 +26309,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>%1 túnels</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Túnel anònim 0x</translation>
     </message>
@@ -24979,6 +26530,10 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">Túnels anònims</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25172,17 +26727,12 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Formulari</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Habilita la interfície WEB del RetroShare</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Estat:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Paràmetres web</translation>
     </message>
@@ -25216,33 +26766,35 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port:</source>
+        <translation type="vanished">Port:</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation>Permetre accés des de qualsevol adreça IP (Per defecte: només connexió local)</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <source>Apply setting and start browser</source>
+        <translation type="vanished">Aplicar opcions i iniciar navegador</translation>
+    </message>
+    <message>
+        <source>Note: these settings do not affect retroshare-nogui. Retroshare-nogui has a command line switch to activate the web interface.</source>
+        <translation type="vanished">Nota: Aquestes opcions no afecten al Retroshare-nogui. Retroshare-nogui té un paràmetre en línia de comanda per activar la interfície web.</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Interfície web&lt;/h1&gt; &lt;p&gt;La interfície web et permet controlar el Retroshare des del navegador. Múltiples dispositius poden compartir el control sobre una instancia de Retroshare. Per tan pots començar una conversa en una tauleta i més tard utilitzar un ordinador d&apos;escriptori per continuar-la.&lt;/p&gt;&lt;p&gt;Avís: no exposis la teva interfície web a Internet, perquè no hi ha control d&apos;accés ni encriptació. Si vols utilitzar la interfície web des d&apos;Internet utilitza un túnel SSH o un repetidor per assegurar la connexió.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>Interfície Web no habilitada</translation>
     </message>
@@ -25252,12 +26804,12 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>La interfície web no està activada. Activa-la a Configuració -&gt; Interfície web.</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>Fallo al iniciar interfície Web</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Interfície Web</translation>
     </message>
@@ -25394,7 +26946,11 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Pàgines wiki</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Nou grup</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Nom de pàgina</translation>
     </message>
@@ -25409,7 +26965,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Id d&apos;origen</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25497,7 +27053,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Historial d&apos;edició de la pàgina</translation>
     </message>
@@ -25532,7 +27088,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>IdPàgina</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25562,18 +27118,14 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Etiquetes</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Històric</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Mostra historial d&apos;edició</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Estat</translation>
     </message>
@@ -25594,7 +27146,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>Desfés</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Publica</translation>
     </message>
@@ -25666,6 +27218,10 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">Rang de temps</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25677,7 +27233,16 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Refrescar</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25692,7 +27257,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished">Altres</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25712,7 +27277,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25742,17 +27307,85 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">L&apos;últim mes</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">L&apos;ultima setmana</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Avui</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nou</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">des de</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">fins</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Cercar/Filtrar</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Tota la xarxa</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Controlar comptes</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Mostrant:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Tu mateix</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Amics</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Seguint</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Personalitzat</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Compte 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Compte 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Compte 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">Casella de selecció</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Publica Pols a Wire</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25815,42 +27448,35 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation type="unfinished">Formulari</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Treure</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Ubicació:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25895,41 +27521,11 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Seguint</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Desconegut</translation>
@@ -26007,7 +27603,7 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <translation>%1y any %2d</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26040,11 +27636,15 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Imatges (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation>Acceptes connexions signades amb aquest perfil?</translation>
     </message>
@@ -26053,6 +27653,10 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>Name of the profile</source>
         <translation>Nom del perfil</translation>
     </message>
+    <message>
+        <source>This column indicates trust level and whether you signed the profile PGP key</source>
+        <translation type="vanished">Aquesta columna indica el nivell de confiança i si has signat la clau de perfil PGP</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
@@ -26163,6 +27767,10 @@ Si tens molt ample de banda pots augmentar-lo fins a 30-40, per permetre que tú
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> - </source>
+        <translation type="vanished">-</translation>
+    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_cs.ts b/retroshare-gui/src/lang/retroshare_cs.ts
index 9ddff2a55..24f243cde 100644
--- a/retroshare-gui/src/lang/retroshare_cs.ts
+++ b/retroshare-gui/src/lang/retroshare_cs.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Přidat komentář</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare:  rozšířené hledání</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Kritéria pro vyhledávání</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Přidat další kriterium pro vyhledávání</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Vymazat kritéria pro vyhledávání</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Zrušit hledání.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Hledat</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Vytvořit album</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Jméno alba:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Kategorie:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Zvířata</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Rodina</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Kontakty</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Květiny</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Prázdniny</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Krajiny</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Domácí mazlíčci</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Portréty</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Cestování</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Práce</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Náhodné</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Nadpis:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Kde:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotograf:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Popis:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Sdílet nastavení</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Pravidla</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Kvalita:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Komentáře:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Identita:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Veřejné</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Omezené</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Zmenšit obrázky (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Zmenšit obrázky (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Poslat původní obrázky</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Zakázat komentáře</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Pouze autentizované komentáře</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Kdokoliv může komentovat</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Publikovat pod identitou</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Táhni &amp;amp; Pusť pro vložení obrázku. Klikni na obrázek pro změnu detailů.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Zpět</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Přidat fotografie</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Publikovat album</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Bezejmenné album</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Ohodnotit toto album...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Kde byly vyfoceny?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Nahrád náhled alba</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Album</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Náhled alba</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Shrnutí</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>legenda</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Kde:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Kdy</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Popis:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Možnsti sdílení</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Komentáře</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Zveřejnit identitu</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Viditelnost</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Varování: Zdejší služby jsou testovací, pomožte nám je otestovat.
@@ -569,6 +783,14 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <source>Circles</source>
         <translation>Okruhy lidí</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">Fóra</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">Kanály</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation>Fotografie</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -633,13 +842,17 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Přidat fotku</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Odebrat</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Zobrazit fotku</translation>
     </message>
@@ -658,6 +871,10 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Načíst fotku</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation>Reset</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Rychlost stahování</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Rychlost odesílání</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Podržet nad ostatními</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Styl</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <source>% Opaque</source>
         <translation>% Opaque</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Uložit</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Zrušit</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Od:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Skrýt nastavení</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,7 +1063,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Komentáře</translation>
     </message>
@@ -852,12 +1093,12 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -885,7 +1126,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -943,7 +1184,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Označit zprávu za přečtenou</translation>
     </message>
@@ -983,7 +1224,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished">Nový</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
@@ -991,12 +1232,12 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Rozbalit</translation>
     </message>
@@ -1042,12 +1283,12 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,17 +1457,17 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Kanály</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Záložky</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
@@ -1236,17 +1477,11 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Stahování</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Načítat příspěvky na pozadí</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Otevřít nový kanál v nové záložce</translation>
     </message>
@@ -1254,7 +1489,7 @@ Ale měj na paměti, že veškerá zdejší nastavení se mohou změnit s každo
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1512,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1302,18 +1537,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Rozbalit</translation>
     </message>
@@ -1328,7 +1563,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1338,7 +1573,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Komentáře</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Skrýt</translation>
     </message>
@@ -1346,7 +1591,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1537,7 +1782,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Ukázat konverzační místnost</translation>
     </message>
@@ -1549,6 +1794,22 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Máte %1 nových zpráv</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Máte %1 novou zprávu</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 nových zpráv</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 nová zpráva</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1570,14 +1831,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Neznámá místnost</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Smazat vše</translation>
     </message>
@@ -1585,13 +1845,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Počet</translation>
     </message>
@@ -1601,7 +1861,29 @@ into the image, so as to
         <translation>Téma</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1611,7 +1893,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1668,12 +1950,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1683,31 +1965,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Vytvořit konverzační místnost</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[nebylo poskytnuto žádné téma]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Informace o místnosti</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Soukromé</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Veřejné</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>Anonymní ID přijato</translation>
     </message>
@@ -1717,25 +1999,42 @@ Double click a chat room to enter and chat.</source>
         <translation>Odstranit automatické přihlašování</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Automaticky přihlásit</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Hledat místnost</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Hledat</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Přihlášen</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Sloupce</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Ano</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Ne</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1747,47 +2046,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Téma:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Bezpečnost:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Počet uživatelů:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
@@ -1802,24 +2101,13 @@ Double click a chat room to enter and chat.</source>
         <translation>Bez anonymních ID</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Ukázat</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>sloupec</translation>
@@ -1833,7 +2121,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Odstranit předmět</translation>
     </message>
@@ -1878,22 +2166,46 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Vzdálený chat</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Všichni</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Kontakty</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Nikdo</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Přijmout šifrovaný vzdálený chat od</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Nastavení chatu</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Povolit smajlíky v soukromém chatu</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Používat smajlíky ve skupinovém chatu</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Povolit vlastní fonty</translation>
     </message>
@@ -1902,6 +2214,10 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>Povolit vlastní velikost fontů</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Minimální velikost fontu</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1913,7 +2229,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Povolit latinku</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1938,7 +2254,11 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished">Načíst vložené obrázky</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Konverzace</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Ikona upozornění</translation>
     </message>
@@ -1947,6 +2267,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Soukromý chat</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1968,7 +2292,11 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Font chatu</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Změnit font chatu</translation>
     </message>
@@ -1978,10 +2306,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Font chatu:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Historie</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Styl</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1996,13 +2328,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Skupinový chat</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Soukromý chat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2066,28 +2402,22 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Zde se nastavuje uchovávání historie na vašem HDD pro různé druhy chatu. Zprávy staršího data budou smazány, aby nedošlo k přesycení sítě (např. pro konverzační místnosti a vzdálený chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Konverzační místnosti</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Aktivováno:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2097,17 +2427,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2204,7 +2524,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Neukládat starší než...dní (0 = bez omezení)</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Defaultní hledání</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Citlivost velikost písmen</translation>
     </message>
@@ -2243,6 +2567,10 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation>Práh automatického vyhledávání</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Výchozí identita pro konverzační místnost:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2310,7 +2638,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Zobrazit chat</translation>
     </message>
@@ -2346,7 +2674,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
@@ -2381,12 +2709,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Kurzíva</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2466,6 +2794,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2503,7 +2836,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>píše...</translation>
     </message>
@@ -2525,7 +2858,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Chcete opravdu vymazati historii z počítače?</translation>
     </message>
@@ -2575,7 +2908,7 @@ after HTML conversion.</source>
         <translation>je zaneprázdněn a může se stát, že neodpoví</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Hledat s rozlišením malých a velkých písmen</translation>
     </message>
@@ -2597,7 +2930,7 @@ after HTML conversion.</source>
         <translation>Nezastavovat vybarvování po X nálezech (vyšší zátěž CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Hledat předchozí &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2612,12 +2945,16 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Hledat &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Status)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Nastav typ a barvu písma</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Přiožit soubor</translation>
     </message>
@@ -2633,12 +2970,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Označ vybraný text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2649,12 +2986,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>Nalezeno.</translation>
     </message>
@@ -2674,7 +3011,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Zde napiš zprávu...</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Nezastavovat vybarvování po</translation>
     </message>
@@ -2700,7 +3037,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Ukazuji detaily:</translation>
     </message>
@@ -2722,7 +3059,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Osobní Kruhy</translation>
     </message>
@@ -2748,7 +3085,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Kontakty</translation>
     </message>
@@ -2808,7 +3145,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Kontakty kontaktů</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Externí Kruhy (Admin)</translation>
     </message>
@@ -2824,7 +3161,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Okruhy lidí</translation>
     </message>
@@ -2876,48 +3213,43 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Chyba : nemohu získat údaje kontaktu</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2929,7 +3261,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Šifrování</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>Nespojen</translation>
     </message>
@@ -3011,17 +3343,25 @@ Double click on it to add his name on text writer.</source>
         <translation>žádný</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Tento certifikát obsahuje</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;a &lt;b&gt;ID uzlu&lt;/b&gt; a &lt;b&gt;jméno&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">&lt;b&gt;onion (TOR) adresa&lt;/b&gt; a &lt;b&gt;port&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">an &lt;b&gt;IP adresa&lt;/b&gt; a &lt;b&gt;port&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tento certifikát musíš předat svým budoucím kontaktům. Použij emailu nebo jiné komunikační platformy.&lt;/p&gt;</translation>
     </message>
@@ -3036,7 +3376,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Šifrovcí metoda použitá &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. Spojení s kontakty&lt;/p&gt;&lt;p&gt;je vždy silně šifrováno a pokud je použito DHE, spojení navíc využívá&lt;/p&gt;&lt;p&gt;&amp;quot;zabezpečené přeposílání&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>s</translation>
     </message>
@@ -3053,16 +3393,104 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Průvodce přidáním kontaktu</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Přidat kontakt</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Nahrát soubor s certifikátem kontaktu (který vám například přišel emailem s pozvánkou).</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">Přidat vybrané důvěryhodné kontakty mých důveryhodných kontaktů</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Zahrnout podpisy</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Kopírovat váš certifikát do schránky</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Uložit váš certifikát do souboru</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Spustit emailový klient</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Soubory certifikátu</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Nahrát PGP certifikáty ze souboru.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Importovat certifikát kontaktu...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Musíte vygenerovat soubor s certifikátem a předat jej vašemu kontaktu. Můžete také použít již existující dříve vytvořený soubor.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Exportovat můj certifikát...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Přetáhněte certifikát kontaktu do tohoto okna a nebo zadejte cestu k tomu souboru do pole níže</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Procházet</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Kontakty kontaktů</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Vyberte koho chcete přidat mezi své kontakty.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Ukaž mi:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Přidat tyto protějšky do kontaktů</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare ID</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Použít RetroShareID k přidání kontaktu dostupného ve vaší síti.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Přidat kontakty RetroShare ID...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Vložte RetroShare ID vašich kontaktů do textového pole níže</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Zadejte RetroShare ID vašeho kontaktu, např. Franta@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3104,7 +3532,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Pozvěte kontakty emailem</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Zadejte emailové adresy vašich kontaktů oddělené středníkem.</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Emailové adresy vašich kontaktů:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Vložte emailové adresy vašich kontaktů</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Předmět:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3120,32 +3568,40 @@ Double click on it to add his name on text writer.</source>
         <translation>Podrobnosti požadavku</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Podrobnosti o kontaktu</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Email:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Uzel:</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Přidat do skupiny:</translation>
     </message>
@@ -3155,7 +3611,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Autentizovat kontakt (podepsat PGP klíč), potvrzuje vaši plnou důvěru,nelze vzít zpět!</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3180,22 +3636,16 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Přidat jako kontakt pro přímé spojení</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Klikni na &quot;Finish&quot; pro přidání kontaktu</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Je to smutné, ale došlo k nějaké chybě</translation>
     </message>
@@ -3215,27 +3665,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Detaily vašeho kontaktu:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Validita klíče:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Podepsali</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Tento protějšek se již nachází ve vašem seznamu kontaktů. Jeho opětovné přidání může nanejvýš nastavit jeho novou IP adresu.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3281,17 +3736,45 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Načítání certifikátu selhalo</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Nelze získat podrobnost o PGP klíči %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Nepodepsané kontakty</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Kontakty kontaktů které mi již důvěřují</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Podepsané protějšky zobrazené jako odmítnuté</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Jméno protějšku</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Podepsán také (kým):</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">ID protějšku</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Pozvánka do RetroShare -  sociální P2P sítě zaměřené především na sdílení souborů.</translation>
     </message>
@@ -3311,12 +3794,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3324,7 +3807,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3364,7 +3847,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Žádost o přidání do kontaktu od: </translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3389,7 +3872,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3399,7 +3882,55 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Načtení certifikátu selhalo: soubor %1 nebyl nalezen</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Protějšek %1 není ve vaší síti dostupný.</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Nyní je používán starý (zpětně kompatibilní) formát certifikátu (kliknutím přepnete na nový).</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Nyní je používán nový formát certifikátu (bezpečnější a odolnější).</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Odstranit podpisy</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">Pozvánka do RetroShare</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Informace</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">V horní části okna průvodce se nachází váš PGP certifikát, který musíte nějakým způsobem poslat vašemu kontaktu, například pomocí emailu, skypu, facebooku, výměnou na fóru nebo jakkoliv jinak, můžete použít cokoliv čím si posíláte textové zprávy. Váš kontakt vám rovněž musí zaslat svůj certifikát, takže si je vlastně vyměníte. Vy zkopírujete a vložíte jeho certifikát do textového pole v dolní části obrazovky průvodce, a on udělá to samé s váším certifikátem. Pokud vše funguje jak má, mělo by se vám podařit navázat přímé spojení.
+
+O vašem PGP certifikátu: Váš PGP který obsahuje jedinečný veřejný klíč vaší identity, a ve spodní části také vaší lokální a veřejnou IP adresu a umístění. Kontaktu jemuž tento certifikát pošlete byste proto měli alespoň elementárně důvěřovat. Podle účelu použití tohoto programu se může jednat o členy vaší rodiny, přátele či obchodní kontakty, ale také třeba lidi z druhého konce světa, o kterých jediné co s jistotou víte je, že sdílíte společné zájmy.
+
+Spojení: Abyste se mohli spojit, musí alespoň jeden z vás mít veřejnou IP adresu, případně musíte být napojeni na někoho kdo ji má a poslouží jako prostředník (tzv. proxy) pro přeposílání zpráv, souborů a ostatních typů dat.
+
+Program RetroShare vám umožňuje vytvořit si vlastní sociální síť, která vám zajistí lepší soukromí, protože vaše data nejsou ukládána v počítačích velkých firem, ale pouze u vás a vašich kontaktů. Protože si ji ale musíte vybudovat vy sami pěkně od píky, je dobré k získávání nových kontaktů využít existujících sociálních a komunikačních služeb které již užíváte.
+
+RetroShare neaspiruje na to být nejlepší sociální sítí, má své mouchy a problémy, ale jeho hlavní devizou je právě možnost vytvořit částečně anonymní P2P síť, v níž můžete relativně bezpečně sdílet soubory a diskutovat, při vhodné volbě přezdívky a kontaktů dokonce získáte i jistou míru anonymity.</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Váš certifikát byl zkopírován do schránky, vložte ho do zprávy kterou pošlete vašemu kontaktu emailem či jiným způsobem.</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Uložit jako...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3438,7 +3969,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Nic ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Stahovat přímo od pokud možno</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3448,7 +3983,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3467,13 +4002,41 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Doporučit kontakty jiným kontaktům</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Doporučené kontakty</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Zpráva:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Doporučit kontakty</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Pro</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Prosím zvol alespoň jeden kontakt pro doporučení</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Prosím zvol alespoň jednoho příjemce</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Přidat klíč do klíčenky</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Tento klíč je již v klíčence</translation>
     </message>
@@ -3489,7 +4052,7 @@ pro posílání např. zpráv uzlům,
 které nemáte přímo v kontaktech.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Nesprávná verze certifikátu. RetroShare verze 0,6 a 0,5 jsou vzájemně nekompatibilní.</translation>
     </message>
@@ -3524,7 +4087,7 @@ které nemáte přímo v kontaktech.</translation>
         <translation>Přidat IP do whitelist</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>V certifikátu není IP adresa!</translation>
     </message>
@@ -3534,10 +4097,27 @@ které nemáte přímo v kontaktech.</translation>
         <translation>&lt;p&gt;V certifikátu není IP adresa. Discovery a DHT se ji pokusí najít. Po jejím nalezení se v Událostech objeví bezpečnostní upozornění, pomocí kterého můžete tuto adresu přidat do whitelist pro úspěšné spojení.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Přidán s certifikátem od %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Vložit certifikát vašeho kontaktu ze schránky</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Načtení certifikátu selhalo: nemůžu přečíst soubor %1</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Načtení certifikátu selhalo: něco je špatně s %1</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3599,7 +4179,7 @@ které nemáte přímo v kontaktech.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>Zkouším UDP</translation>
     </message>
@@ -3627,7 +4207,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Pokus o spojení - informace</translation>
     </message>
@@ -3637,20 +4217,17 @@ p, li { white-space: pre-wrap; }
         <translation>Neplatné ID kontaktu</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Neznámý stav</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Odpojen</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Za symetrickým NAT</translation>
     </message>
@@ -3660,14 +4237,12 @@ p, li { white-space: pre-wrap; }
         <translation>Za NAT &amp; bez DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>NET Restart</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>Za NAT</translation>
     </message>
@@ -3677,8 +4252,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bez DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>STAV SÍTĚ V POŘÁDKU</translation>
     </message>
@@ -3703,7 +4277,7 @@ p, li { white-space: pre-wrap; }
         <translation>Hledám RS uzly</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Vyžaduje zapnuté DHT</translation>
     </message>
@@ -3995,7 +4569,7 @@ p, li { white-space: pre-wrap; }
         <translation>Prosím zopakujte import kompletního certifikátu</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4003,8 +4577,7 @@ p, li { white-space: pre-wrap; }
         <translation>nedostupné</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>NEOVĚŘITELNÝ FORWARD!</translation>
     </message>
@@ -4014,7 +4587,7 @@ p, li { white-space: pre-wrap; }
         <translation>NEOVĚŘITELNÝ FORWARD &amp; BEZ DHT!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Vyhledávám</translation>
     </message>
@@ -4050,12 +4623,12 @@ p, li { white-space: pre-wrap; }
         <translation>Detail Kruhu</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4075,7 +4648,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4095,18 +4668,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtr</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Přezdívka</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4121,7 +4694,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Typ</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Jméno:</translation>
     </message>
@@ -4161,19 +4742,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Nastavte prosím jméno vašeho Kruhu</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Nevybráno žádné omezení Kruhu</translation>
     </message>
@@ -4183,24 +4764,12 @@ p, li { white-space: pre-wrap; }
         <translation>Nevybrány žádné limity Kruhu</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
@@ -4210,7 +4779,7 @@ p, li { white-space: pre-wrap; }
         <translation>Odstranit </translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Hledat</translation>
@@ -4225,6 +4794,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Podepsáno</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Podepsáno známými uzly</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4241,6 +4814,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP identita</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Anonymní ID</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4263,13 +4840,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">Vytvořit</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP link ID</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4288,7 +4869,7 @@ p, li { white-space: pre-wrap; }
         <translation>Vytvořit skupinu</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished">Jméno skupiny:</translation>
     </message>
@@ -4323,7 +4904,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Přidat příspěvek</translation>
     </message>
@@ -4333,7 +4914,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zpráva</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4394,11 +4975,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Přetáhni soubory zde nebo klikni na Přidat soubory.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Zkopíruj/Vlož RetroShare odkazy ze svých sdílení&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Přiložit soubor</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Nastavit obrázek</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Zpráva</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Předmět:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4484,17 +5077,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4513,18 +5106,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Soubor je již přidán a zatříděn</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Prosím zadejte předmět</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Nahrát miniaturu</translation>
     </message>
@@ -4539,12 +5131,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Generovat hromadné údaje</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Opravdu chcete vygenerovat %1 zpráv?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Chcete přidat soubory, které však přímo nesdílíte. Opravdu?</translation>
     </message>
@@ -4578,7 +5176,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Odeslat příspěvek na fórum</translation>
     </message>
@@ -4587,6 +5185,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Fórum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Předmět</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4607,8 +5209,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4627,7 +5229,7 @@ p, li { white-space: pre-wrap; }
         <translation>Přetáhnutím do tohoto okna můžete přiložit soubory </translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4657,17 +5259,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Žádné fórum</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>Reakce na</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Nadpis</translation>
     </message>
@@ -4720,7 +5322,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Nahrát soubor s obrázkem</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4730,8 +5332,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Generovat hromadné údaje</translation>
     </message>
@@ -4740,6 +5342,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Opravdu chcete vygenerovat %1 zpráv?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Odeslat</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4754,7 +5360,23 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Vytvořit konverzační místnost</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Konverzační místnosti jsou decentralizované a anonymní konverzační skupiny (chat). Všichni účastníci obdrží vždy všechny zprávy. Jakmile je skupina vytvořena, můžete pozvat další kontakty (v záložce Kontakty).</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Jméno místnosti:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Téma konverzace:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4789,7 +5411,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Vytvořit</translation>
     </message>
@@ -4799,7 +5421,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4814,7 +5436,11 @@ Do you want to discard this message?</source>
         <translation>Zvolte kontakty, s nimiž chcete uskutečnit skupinovou konverzaci</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Pozvané kontakty</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4835,7 +5461,7 @@ Do you want to discard this message?</source>
         <translation>Kontakty:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Použitá identita:</translation>
     </message>
@@ -4843,17 +5469,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Veřejné informace</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
@@ -4863,12 +5489,12 @@ Do you want to discard this message?</source>
         <translation>ID lokace:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Verze RetroShare :</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Připojen od:</translation>
     </message>
@@ -4888,7 +5514,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4898,7 +5529,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Další informace</translation>
     </message>
@@ -4908,12 +5539,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Certifikát</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4923,7 +5559,11 @@ Do you want to discard this message?</source>
         <translation>Zahrnout podpisy</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Uložit klíč do souboru</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exportovat identitu</translation>
     </message>
@@ -4997,33 +5637,33 @@ tam ji importujte.</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>PGP otisk:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Informace o uzlu</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP ID :</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5062,6 +5702,14 @@ tam ji importujte.</translation>
         <source>Node</source>
         <translation>Uzel</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Vytvořte nový uzel...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">Zobrazit statistiky</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5113,7 +5761,7 @@ tam ji importujte.</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5781,7 +6429,7 @@ tam ji importujte.</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Spustit soubor</translation>
     </message>
@@ -5789,38 +6437,38 @@ tam ji importujte.</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>pro</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>ignorovat případy</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>dd.MM.yyyy</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5828,12 +6476,12 @@ tam ji importujte.</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Výrazný Widget</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Odstranit tento výraz</translation>
     </message>
@@ -5995,7 +6643,7 @@ tam ji importujte.</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Obrázek</translation>
     </message>
@@ -6005,7 +6653,7 @@ tam ji importujte.</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6065,21 +6713,11 @@ tam ji importujte.</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Sdílené soubory a složky mých kontaktů</translation>
     </message>
@@ -6201,7 +6839,7 @@ tam ji importujte.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6243,7 +6881,7 @@ tam ji importujte.</translation>
         <translation>Zobrazit skupiny</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
@@ -6279,7 +6917,7 @@ tam ji importujte.</translation>
         <translation>Přidat do skupiny</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6295,7 +6933,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6532,7 +7170,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Potvrdit přidání kontaktu</translation>
     </message>
@@ -6549,6 +7187,10 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Hledat :</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6570,7 +7212,7 @@ at least one peer was not added to a group</source>
         <translation>Hledat kontakty</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished">Označit vše</translation>
     </message>
@@ -6581,132 +7223,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Přidat kontakt</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Editovat status</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Rozhlas</translation>
     </message>
@@ -6789,38 +7315,33 @@ Also check your ports!</source>
         <translation>Nastavit výchozí font</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Klíčenka</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>RetroShare rozhlas: zpráva je odeslána všem připojeným kontaktům.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Síť</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Síťový graf</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Zde napiš svůj status.</translation>
     </message>
@@ -6838,17 +7359,7 @@ Also check your ports!</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Všechny prvky vyžadují zadání alespoň tří znaků.</translation>
     </message>
@@ -6858,12 +7369,17 @@ Also check your ports!</source>
         <translation>Hesla nejsou stejná</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Heslo pro PGP</translation>
@@ -6884,38 +7400,38 @@ Also check your ports!</source>
         <translation>Nemůžu vygenerovat nový certifikát, možná jste špatně napsali PGP heslo!</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6935,12 +7451,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6950,43 +7466,42 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Pokročilé volby</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Váš profil je spojen s PGP párem klíčů. V současné době RetroShare ignoruje DSA klíče.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Port pro komunikaci.&lt;/p&gt;&lt;p&gt;Hodnota mezi 1024 a 65535 &lt;/p&gt;&lt;p&gt;by měla být OK. Můžete to změnit pak později.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7034,13 +7549,13 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation>Profil se nepodařilo uložit, protože nastala chyba.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importovat profil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7050,7 +7565,7 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7085,7 +7600,7 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7095,7 +7610,12 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7105,7 +7625,12 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7331,13 +7856,36 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation>Začínáme</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Pozvat přátelé</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;Bez kontaktů nestojí RetroShare za nic. Klikněte na tlačítko a pozvěte nové lidi!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Pošlete pozvánku s vaším &amp;quot;certifikátem&amp;quot; vašim přátelům.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Ujistěte se, že vám také pošlou pozvánku... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Můžete se spojit pouze tehdy, pokud jste se do kontaktů přidali navzájem.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Přidat tvoje přátele do Retroshare</translation>
     </message>
@@ -7347,103 +7895,89 @@ a vytvořit nový node využívající stejný profil.</translation>
         <translation>Přidat přátele</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Připojit k přátelům</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Pokročílé: Otevřený Port Firewallu</translation>
-    </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Připojit k přátelům</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Pokročílé: Otevřený Port Firewallu</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Další pomoc a podpora</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Otevřít webovou stránku RetroShare</translation>
     </message>
@@ -7468,7 +8002,7 @@ p, li { white-space: pre-wrap; }
         <translation>Emailová zpětná vazba</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>Pozvánka do RetroShare</translation>
     </message>
@@ -7522,12 +8056,12 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>RetroShare zpětná vazba</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>RetroShare Podpora</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7651,7 +8185,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Zobrazit skupinovou konverzaci</translation>
     </message>
@@ -7659,7 +8193,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7829,7 +8363,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Nadpis</translation>
     </message>
@@ -7842,12 +8376,12 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7872,7 +8406,19 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort by Name</source>
+        <translation type="vanished">Seřadit podle jména</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Seřadit podle oblíbenosti</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Seřadit podle posledního příspěvku</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7887,14 +8433,14 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Poslední příspěvek</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7905,13 +8451,17 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished">Popularita</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Zobrazit</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7924,7 +8474,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>a</translation>
     </message>
@@ -8060,7 +8610,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanály</translation>
@@ -8071,22 +8621,22 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Vytvořit kanál</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Zapnout automatické stahování</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Moje kanály</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Odebírané kanály</translation>
     </message>
@@ -8106,12 +8656,12 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Vypnout automatické stahování</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8146,22 +8696,22 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Přehrát</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
@@ -8181,17 +8731,17 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Přehrát soubor</translation>
     </message>
@@ -8201,10 +8751,33 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished">Soubor %1 neexistuje.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulář</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Jméno souboru</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Velikost</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Nadpis</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Status</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Vytvořit nový kanál</translation>
     </message>
@@ -8242,19 +8815,9 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Textový popisek</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Odebírat kanál</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8268,7 +8831,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -8283,7 +8846,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Popis kanálu</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Nahrávám</translation>
     </message>
@@ -8298,9 +8861,8 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
+        <source>New Channel</source>
+        <translation type="vanished">Nový kanál</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8311,7 +8873,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8332,7 +8894,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
@@ -8394,18 +8956,18 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Komentáře</translation>
     </message>
@@ -8420,17 +8982,21 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Nahrávám</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8455,16 +9021,67 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Přehrát</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Přidat příspěvek do kanálu</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Nahrávám</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Nadpis</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Hledat podle jména fóra</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Text příspěvku</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Jméno souboru</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Není vybrán žádný kanál</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Vypnout automatické stahování</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Zapnout automatické stahování</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Kanály</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Soubory</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Popis:</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Přidat příspěvek do kanálu</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8534,7 +9151,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8570,7 +9187,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Komentáře</translation>
     </message>
@@ -8585,13 +9202,13 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished">Kanály</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8606,7 +9223,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8621,7 +9238,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8681,22 +9298,12 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8771,13 +9378,12 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Přihlášen</translation>
     </message>
@@ -8828,17 +9434,17 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8953,7 +9559,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8966,7 +9572,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation>Formulář</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8996,7 +9602,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Komentáře</translation>
@@ -9035,7 +9641,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Reagovat na komentář</translation>
     </message>
@@ -9059,21 +9665,6 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <source>Vote Down</source>
         <translation>Palec dolu</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9083,7 +9674,7 @@ Při používání sítě proto pokud možno používejte pouhou přezdívku, ne
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9112,7 +9703,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9143,7 +9734,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9194,7 +9785,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Odebírat fórum</translation>
     </message>
@@ -9210,7 +9801,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -9230,9 +9821,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Textový popisek</translation>
+        <source>Loading</source>
+        <translation type="vanished">Nahrávám</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9263,13 +9853,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Předmět: </translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Neodebírat fórum</translation>
     </message>
@@ -9280,7 +9870,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -9300,17 +9890,21 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Nahrávám</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
@@ -9323,66 +9917,63 @@ before you can comment</source>
         <translation>Formulář</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Založit nové vlákno ve vybraném fóru</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Hledat ve fórech</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Poslední příspěvek</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>podle vláken</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Vše za sebou</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Nadpis</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Načítám</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9392,7 +9983,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Odpovědět na příspěvek</translation>
     </message>
@@ -9416,6 +10012,10 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Stáhnout všechny soubory</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Další nepřečtený</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9432,23 +10032,31 @@ before you can comment</source>
         <translation>Hledat podle autora</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Obsah</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Hledat v obsahu zprávy</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Bez jména</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Odpovědět</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9491,12 +10099,16 @@ before you can comment</source>
         <translation>Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Rozbalit</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9526,8 +10138,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9541,6 +10153,22 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anonymní sdílení</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">podepsáno</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">žádný</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... chybějící zpráva ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9610,12 +10238,12 @@ before you can comment</source>
         <translation>Původní zpráva</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">Editovat</translation>
     </message>
@@ -9676,7 +10304,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9696,7 +10324,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9748,7 +10376,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9758,7 +10386,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9773,7 +10401,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9839,12 +10467,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Fórum</translation>
@@ -9875,16 +10503,31 @@ This message is missing. You should receive it later.</source>
         <translation>Ostatní fóra</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Čekám</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Stahuji</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Načítám</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Jméno uživatele</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9893,14 +10536,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">zaškrtněte protějšky s nimiž chcete sdílet soukromý klíč k publikačnímu právu</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Sdílet klíč s</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9908,7 +10559,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Veřejné</translation>
     </message>
@@ -9968,7 +10619,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished">Komentáře:</translation>
     </message>
@@ -9991,7 +10642,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10007,12 +10658,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10029,23 +10680,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10061,28 +10712,22 @@ This message is missing. You should receive it later.</source>
         <translation>Detaily</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10092,12 +10737,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10107,7 +10752,7 @@ This message is missing. You should receive it later.</source>
         <translation>Poslední příspěvek</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10182,12 +10827,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Popularita</translation>
     </message>
@@ -10203,22 +10843,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Vytvořit</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Autor</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10226,7 +10871,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Nahrávám</translation>
     </message>
@@ -10286,7 +10931,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10343,12 +10988,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopírovat RetroShare odkaz</translation>
     </message>
@@ -10371,7 +11016,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10384,14 +11029,18 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Nahrávám</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,7 +11050,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10411,12 +11060,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10436,14 +11080,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10455,7 +11091,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10503,13 +11139,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Nahrávám</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10890,7 +11530,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10906,7 +11546,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Autoři</translation>
     </message>
@@ -10925,7 +11565,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10999,7 +11639,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulář</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11009,7 +11649,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11037,7 +11677,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11047,7 +11687,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Kopírovat váš certifikát do schránky</translation>
     </message>
@@ -11057,7 +11697,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Uložit váš certifikát do souboru</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11077,37 +11717,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11119,12 +11735,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11139,7 +11755,12 @@ new short format</source>
         <translation type="unfinished">Pozvánka do RetroShare</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished">Uložit jako...</translation>
     </message>
@@ -11404,14 +12025,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11421,12 +12042,12 @@ p, li { white-space: pre-wrap; }
         <translation>Hledat</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Vytvořit novou identitu</translation>
     </message>
@@ -11436,7 +12057,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11451,27 +12072,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished">Zavřít</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11487,39 +12108,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Okruhy lidí</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11539,20 +12150,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Osobní Kruhy</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11562,78 +12171,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Odeslat zprávu</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11644,17 +12253,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anonymní sdílení</translation>
     </message>
@@ -11669,24 +12278,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11701,12 +12310,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11716,7 +12320,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11791,7 +12395,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11821,7 +12425,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">neznámé</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11836,7 +12440,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished">Upravit Kruh</translation>
     </message>
@@ -11884,7 +12488,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11892,7 +12496,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11935,7 +12539,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11977,7 +12581,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+2"/>
         <source>Message</source>
-        <translation type="unfinished">Zpráva</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12015,7 +12619,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12031,12 +12635,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12141,7 +12750,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12191,21 +12800,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12215,7 +12824,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12230,7 +12839,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12245,12 +12854,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12270,12 +12879,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12285,7 +12894,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12293,7 +12902,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Přezdívka</translation>
     </message>
@@ -12323,13 +12932,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12343,7 +12946,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12353,12 +12956,7 @@ These identities will soon be not supported anymore.</source>
         <translation>nedostupné</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12369,27 +12967,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12409,7 +13007,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12419,18 +13017,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12440,7 +13032,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12450,7 +13047,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12460,15 +13057,10 @@ These identities will soon be not supported anymore.</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Odebrat</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12494,7 +13086,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Přidat</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Vytvořit</translation>
     </message>
@@ -12504,13 +13096,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12520,7 +13112,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12594,7 +13186,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
@@ -12604,12 +13196,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Odebrat</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Označit vše</translation>
     </message>
@@ -12628,38 +13220,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Citovat</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Odeslat</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12677,32 +13257,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12723,12 +13298,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12737,31 +13307,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Otevřít složku</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Kontroluji...</translation>
     </message>
@@ -12771,7 +13336,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Zkontrolovat soubory</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12799,7 +13364,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Přidat kontakt</translation>
     </message>
@@ -12815,8 +13380,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Nastavení</translation>
     </message>
@@ -12837,7 +13401,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Ukončit</translation>
     </message>
@@ -12848,12 +13412,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Průvodce nastavením</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 - bezpečná decentralizovaná komunikační platforma</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Nedokončeno</translation>
     </message>
@@ -12878,12 +13442,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Upozornit</translation>
     </message>
@@ -12894,35 +13457,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Zobrazit zprávy</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Graf přenosové rychlosti</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Aplikace</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Minimalizovat</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Maximalizovat</translation>
     </message>
@@ -12937,12 +13496,7 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 nová zpráva</translation>
     </message>
@@ -12972,7 +13526,7 @@ These identities will soon be not supported anymore.</source>
         <translation>%1 kontaktů připojeno</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Opravdu chcete ukončit RetroShare?</translation>
     </message>
@@ -12992,7 +13546,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Ujistěte se, že tento odkaz nebyl zfalšován za účelem dostat vás na škodlivé webové stránky.</translation>
     </message>
@@ -13037,13 +13591,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13058,7 +13611,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13067,17 +13620,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Napsat zprávu</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Odstavec</translation>
     </message>
@@ -13113,12 +13666,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Nadpis 6. úrovně</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Velikost fontu</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Zvětšit velikost fontu</translation>
     </message>
@@ -13133,32 +13686,32 @@ These identities will soon be not supported anymore.</source>
         <translation>Tučné</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Kurzíva</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Zarovnání</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Vložit obrázek</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Zdrojový kód (nastaví neproporcionální font)</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Podtržené</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Předmět:</translation>
     </message>
@@ -13169,32 +13722,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Štítky</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Doporučené soubory</translation>
     </message>
@@ -13264,7 +13817,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Odsadí citaci</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Odeslat komu:</translation>
     </message>
@@ -13304,7 +13857,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Ahoj,&lt;br&gt;doporučuji ti tento kontakt. Když důvěřuješ mě, můžeš důvěřovat také tomuto kontaktu. &lt;br&gt;</translation>
     </message>
@@ -13324,18 +13877,18 @@ These identities will soon be not supported anymore.</source>
         <translation>si vás chce přidat do kontaktů.</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Ahoj %1,&lt;br&gt;&lt;br&gt;%2 si vás chce přidat do kontaktů.&lt;br&gt;&lt;br&gt;Odpovězte nyní:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Děkujeme,&lt;br&gt;Tým RetroShare</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Uložit zprávu</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Zpráva nebyla odeslána.
@@ -13347,17 +13900,7 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Vložit RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Přidat do &quot;Komu&quot;</translation>
     </message>
@@ -13377,7 +13920,7 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Doporučit</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Původní zpráva</translation>
     </message>
@@ -13387,21 +13930,21 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Od</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Komu</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Odesláno</translation>
     </message>
@@ -13416,7 +13959,7 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Na %1, %2 odpověděl:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13426,30 +13969,30 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Fwd:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Chcete odeslat zprávu bez předmětu?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Prosím zadejte alespoň jednoho příjemce.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
@@ -13564,13 +14107,13 @@ Chcete ji uložit jako koncept?</translation>
         <translation type="unfinished">Detaily</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Otevřít soubor...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML soubory (*.htm *.html);;Všechny soubory (*)</translation>
     </message>
@@ -13590,7 +14133,7 @@ Chcete ji uložit jako koncept?</translation>
         <translation>Exportovat do PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Zpráva nebyla odeslána. Chcete ji uložit?</translation>
@@ -13611,7 +14154,7 @@ Do you want to save message ?</source>
         <translation>Přidat další soubor</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13641,18 +14184,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13692,13 +14235,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13708,12 +14251,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13791,7 +14334,7 @@ Do you want to save message ?</source>
         <translation>Výchozí</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Nová karta</translation>
     </message>
@@ -13801,7 +14344,7 @@ Do you want to save message ?</source>
         <translation>Nové okno</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Editovat štítek</translation>
     </message>
@@ -13824,7 +14367,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13832,7 +14375,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
@@ -13860,7 +14403,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Doporučené soubory</translation>
     </message>
@@ -13870,37 +14413,37 @@ Do you want to save message ?</source>
         <translation>Stáhnou všechny doporučené soubory</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Předmět:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Pro:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Štítky:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Odpovědět</translation>
     </message>
@@ -13940,7 +14483,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13992,7 +14535,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14002,12 +14545,12 @@ Do you want to save message ?</source>
         <translation>Přidat %1 do kontaktů</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Bez předmětu</translation>
     </message>
@@ -14017,22 +14560,17 @@ Do you want to save message ?</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14041,24 +14579,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Stáhnout vše</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Vytisknout dokument</translation>
     </message>
@@ -14073,12 +14601,12 @@ Do you want to save message ?</source>
         <translation>HTML soubory (*.htm *.html);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14100,6 +14628,42 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Napsat</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Odpovědět na označenou zprávu</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Odpovědět</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Odpovědět na označené zprávy</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Odpovědět všem</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Přeposlat označenou zprávu</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Vpřed</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Odstranit označenou zprávu</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Smazat</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Vytisknout označenou zprávu</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14178,7 +14742,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Nová zpráva</translation>
     </message>
@@ -14188,16 +14752,60 @@ Do you want to save message ?</source>
         <translation>Napsat</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Odpovědět na označenou zprávu</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Odpovědět</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Odpovědět na označené zprávy</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Odpovědět všem</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Přeposlat označenou zprávu</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Přeposlat</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Odstranit označenou zprávu</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Smazat</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Vytisknout označenou zprávu</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Tisknout</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Zobrazit</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Štítky</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Příchozí</translation>
@@ -14227,17 +14835,21 @@ Do you want to save message ?</source>
         <translation>Koš</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Příchozí celkem:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Složky</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Zobrazit pouze</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Tisknout...</translation>
@@ -14268,7 +14880,7 @@ Do you want to save message ?</source>
         <translation>Přeposlat zprávu</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Předmět</translation>
     </message>
@@ -14278,7 +14890,7 @@ Do you want to save message ?</source>
         <translation>Od</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -14288,7 +14900,39 @@ Do you want to save message ?</source>
         <translation>Obsah</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Seřazení podle příloh</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Seřadit podle předmětu</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Seřadit podle přečtených</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Seřadit podle odesílatele</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Seřadit podle datumu</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Seřadit podle štítků</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Seřadit podle ohvězdičkování</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Přeposlat označenou zprávu</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Hledat v předmětu zprávy</translation>
     </message>
@@ -14297,11 +14941,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Hledat podle odesílatele</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14328,14 +14967,14 @@ Do you want to save message ?</source>
         <translation>Hledat v přílohách</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Ohvězdičkované</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14409,7 +15048,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14423,7 +15062,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14438,33 +15077,34 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Koncepty</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Pro</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Nemáte ohvězdičkované žádné zprávy. Ohvězdičkování slouží ke zvýraznění zpráv, abyste je mohli snáze najít. Zprávu ohvězdičkujete kliknutím na světle šedou hvezdičku kterékoliv zprávy nebo pomocí kontextového menu, ktere otevřete tím, že na ni kliknete pravým tlačítkem myši.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Nemáte žádné zprávy systému.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Pro</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Pro seřazení klikněte</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14472,6 +15112,10 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Celkem:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Zprávy</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14499,17 +15143,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14563,7 +15197,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -14573,7 +15207,7 @@ Do you want to save message ?</source>
         <translation>Odstranit položku</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14608,7 +15242,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
@@ -14749,7 +15383,7 @@ Do you want to save message ?</source>
         <translation>ID certifikátu</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14759,7 +15393,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14773,13 +15407,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14812,13 +15440,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14828,18 +15461,25 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Síť</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14866,7 +15506,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14887,7 +15527,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Skupiny</translation>
     </message>
@@ -14917,19 +15557,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14939,12 +15579,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14954,7 +15594,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Skupina</translation>
     </message>
@@ -15069,7 +15709,7 @@ Reported error:</source>
         <translation type="unfinished">Zabalit vše</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Chcete odstranit tento node?</translation>
     </message>
@@ -15079,7 +15719,7 @@ Reported error:</source>
         <translation type="unfinished">Opravdu chcete odstranit tento kontakt?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15186,7 +15826,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15201,7 +15841,11 @@ at least one peer was not added to a group</source>
         <translation>Smazat vše</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Toto je test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15211,12 +15855,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15271,6 +15915,10 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Blogy</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Bezpečnost</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15292,6 +15940,10 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Pokus o připojení</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15445,6 +16097,10 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Kanál</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15454,7 +16110,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15474,12 +16130,12 @@ at least one peer was not added to a group</source>
         <translation>Chybné heslo!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Nezaregistrovaný plugin či program</translation>
     </message>
@@ -15494,7 +16150,19 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Prohledávám sdílené soubory...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Počítám kryptografickou sumu (hash) souboru.</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Ukládám index souborů...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15505,19 +16173,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15525,7 +16191,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Kontakt je online</translation>
     </message>
@@ -15664,12 +16330,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15678,6 +16339,10 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Podepsat PGP klíč</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15714,7 +16379,12 @@ p, li { white-space: pre-wrap; }
         <translation>Zahrnout podpisy</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15760,21 +16430,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Chyba : nemohu získat údaje kontaktu</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15792,7 +16462,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15861,6 +16531,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Možná že bylo špatně zadané heslo</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15868,12 +16542,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15899,7 +16573,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Konverzace</translation>
     </message>
@@ -15920,7 +16594,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Odstranit položku</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
@@ -15960,7 +16634,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Napsat zprávu</translation>
     </message>
@@ -15974,6 +16648,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>se připojil.</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">se pokusil připojit.</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16012,13 +16690,17 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Neznámý protějšek</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Poslat zprávu</translation>
     </message>
@@ -16185,6 +16867,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulář</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16197,6 +16886,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Komentáře</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Shrnutí</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16257,6 +16954,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Přidat komentář</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16340,17 +17041,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16379,7 +17080,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Jméno alba:</translation>
     </message>
@@ -16438,19 +17139,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16486,12 +17187,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Textový popisek</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16702,27 +17403,12 @@ p, li { white-space: pre-wrap; }
         <translation>Podržet okno nad ostatními</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16775,7 +17461,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nový</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16795,8 +17481,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Komentáře</translation>
     </message>
@@ -16821,13 +17507,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Komentáře</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16855,12 +17541,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16875,22 +17561,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Nahrát soubor s obrázkem</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16906,17 +17582,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16926,7 +17592,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16946,22 +17612,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16976,7 +17632,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Psát jako</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16987,7 +17643,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16997,7 +17653,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nadpis</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17005,12 +17661,16 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Odeslané odkazy</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17044,7 +17704,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17082,17 +17742,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Textový popisek</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17108,7 +17758,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -17123,17 +17773,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Loading</source>
+        <translation type="vanished">Nahrávám</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17146,18 +17795,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Komentáře</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
@@ -17168,12 +17817,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Komentáře</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17183,7 +17832,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17193,17 +17842,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Označit za přečtené a odstranit položku</translation>
     </message>
@@ -17213,7 +17862,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nový</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17223,7 +17872,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17264,11 +17913,34 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Nahrávám</translation>
     </message>
 </context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulář</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nový</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Nahoře</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Další</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17287,17 +17959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17307,15 +17969,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">neznámé</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17325,42 +17987,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished">Textový popisek</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17380,7 +18042,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17410,17 +18072,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17435,17 +18097,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17455,31 +18112,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Editovat</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17494,7 +18147,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Odebírat</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17568,16 +18221,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Není vybrán žádný kanál</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17667,16 +18310,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17788,7 +18431,7 @@ tam ji importujte.</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Editovat status</translation>
@@ -17804,7 +18447,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Veřejné informace</translation>
     </message>
@@ -17839,12 +18482,12 @@ tam ji importujte.</translation>
         <translation>Připojen od:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Další informace</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17888,27 +18531,27 @@ tam ji importujte.</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17918,12 +18561,12 @@ tam ji importujte.</translation>
         <translation type="unfinished">Od:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17953,13 +18596,13 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17971,22 +18614,12 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18001,7 +18634,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18016,24 +18649,34 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Nahrát soubor s obrázkem</translation>
+        <source>From</source>
+        <translation type="vanished">Od</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Datum</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18044,7 +18687,7 @@ tam ji importujte.</translation>
         <translation type="unfinished">Formulář</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18063,7 +18706,7 @@ tam ji importujte.</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18073,7 +18716,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18100,7 +18743,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18110,7 +18753,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18130,7 +18773,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18246,7 +18889,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18254,42 +18897,37 @@ tam ji importujte.</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18321,7 +18959,7 @@ tam ji importujte.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18329,8 +18967,8 @@ tam ji importujte.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Potvrzení</translation>
     </message>
@@ -18598,12 +19236,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Peer detaily</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Požadavek o stáhnutí souboru byl zrušen.</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18634,7 +19272,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Nastala neočekávaná chyba. Prosím pošlete hlášení &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18668,7 +19306,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Běží několik isntancí</translation>
@@ -18687,26 +19325,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18786,7 +19404,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18796,7 +19414,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18806,7 +19424,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18822,7 +19440,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18889,7 +19507,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18917,7 +19535,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19097,29 +19715,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Uzel</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19312,6 +19914,10 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Tento certifikát obsahuje</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19362,18 +19968,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19523,7 +20117,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19690,7 +20284,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulář</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19703,7 +20297,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19876,22 +20470,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19899,12 +20483,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20592,7 +21176,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20713,7 +21297,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20733,7 +21317,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20789,7 +21373,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20803,6 +21387,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... chybějící zpráva ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20816,11 +21405,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Od</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20843,18 +21427,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Seřadit podle přečtených</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Seřadit podle odesílatele</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20877,9 +21456,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20900,7 +21477,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Obnoví všechna(!) uložená nastavení RetroShare na výchozí.</translation>
     </message>
@@ -20961,7 +21538,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Nastaví použitý jazyk.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Nemohu otevřít log soubor &apos;%1&apos;: %2</translation>
     </message>
@@ -20982,7 +21559,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21012,7 +21589,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21030,7 +21607,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21047,12 +21624,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Zadejkte klíčové slovo (alespoň 3 znaky dlouhé, např. mkv)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Začít vyhledávat</translation>
     </message>
@@ -21114,7 +21691,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Smazat</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Klíčová slova</translation>
     </message>
@@ -21129,7 +21706,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Identifikátor dotazu</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Jméno souboru</translation>
     </message>
@@ -21229,23 +21806,23 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Stáhnout vybrané</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Jméno souboru</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopírovat RetroShare odkaz</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Poslat odkaz RetroShare</translation>
     </message>
@@ -21255,7 +21832,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Stáhnout poznámku</translation>
     </message>
@@ -21292,7 +21869,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Odebrat vše</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Složka</translation>
@@ -21303,17 +21880,17 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nový odkaz RetroShare (1 či více)</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished">Otevřít složku</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21333,7 +21910,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Stáhnou podle souboru kolekce...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Kolekce</translation>
     </message>
@@ -21341,7 +21918,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Podrobnosti o kontaktu</translation>
     </message>
@@ -21357,22 +21934,22 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Odstranit položku</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>ID protějšku:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21389,7 +21966,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Skrýt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21414,8 +21991,8 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21423,7 +22000,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>si vás chce přidat do kontaktů.</translation>
     </message>
@@ -21454,7 +22031,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Rozbalit</translation>
     </message>
@@ -21499,12 +22076,12 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Napsat zprávu</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Pokus o připojení</translation>
     </message>
@@ -21524,22 +22101,17 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Neznámý (odchozí) pokus o připojení</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Neznámá bezpečnostní událost</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21549,7 +22121,11 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Neznámý Peer</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Skrýt</translation>
     </message>
@@ -21559,7 +22135,7 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Opravdu chcete odstranit tento kontakt?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21569,12 +22145,12 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21633,12 +22209,12 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Lokální adresa</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21659,22 +22235,22 @@ Vysoká pravděpodobnost že soubor bude nalezen</translation>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Mapa sítě</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Vyhledávač externích IP adres</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21687,16 +22263,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Pro zjištění mé veřejné IP adresy použít následující strány:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21706,46 +22287,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21755,7 +22313,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21780,95 +22338,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21883,7 +22383,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished">neznámé</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21893,7 +22457,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21905,12 +22484,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21920,7 +22499,7 @@ Also check your ports!</source>
         <translation>Vymazat</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21935,23 +22514,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21962,7 +22541,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21972,7 +22561,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21982,7 +22576,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22022,7 +22626,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22037,7 +22641,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">Příchozí</translation>
     </message>
@@ -22073,32 +22682,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22153,7 +22737,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Celkem:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22178,7 +22762,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22190,7 +22774,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Síť</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22213,7 +22797,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -22273,28 +22857,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22310,18 +22883,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22356,12 +22929,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22384,22 +22957,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22434,7 +23007,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22444,12 +23017,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22529,7 +23102,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>zaškrtněte protějšky s nimiž chcete sdílet soukromý klíč k publikačnímu právu</translation>
     </message>
@@ -22539,12 +23112,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22563,7 +23136,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Sdílení složek a souborů v nich obsažených</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22583,17 +23156,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished">Viditelnost</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Přidat sdílenou složku</translation>
     </message>
@@ -22603,7 +23176,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Odebrat</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Uložit a zavřít</translation>
     </message>
@@ -22694,7 +23267,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Složka nebyla nalezena nebo její jméno je neplatné.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22702,7 +23275,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Soubory</translation>
     </message>
@@ -22753,16 +23326,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>Zkontrolovat soubory</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Stáhnout vybrané</translation>
     </message>
@@ -22772,7 +23340,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Stáhnout</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Zkopírovat RetrosShare odkazy do schránky</translation>
     </message>
@@ -22787,7 +23355,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Poslat RetroShare odkazy</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22803,7 +23371,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Doporučení</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22828,7 +23396,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Stáhnou podle souboru kolekce...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22888,7 +23456,7 @@ Select the Friends with which you want to Share your Channel.</source>
     <message>
         <location line="+1"/>
         <source>Message</source>
-        <translation type="unfinished">Zpráva</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
@@ -22971,12 +23539,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Načítám nastavení</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Vytvářím rozhraní</translation>
     </message>
@@ -23000,7 +23568,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Zapamatovat heslo</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Přihlásit se</translation>
     </message>
@@ -23341,7 +23909,7 @@ This choice can be reverted in settings.</source>
         <translation>Zpráva o statusu</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Zpráva:</translation>
     </message>
@@ -23578,7 +24146,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Odstranit všechny štítky</translation>
     </message>
@@ -23614,15 +24182,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23632,13 +24197,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23648,57 +24218,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Chyba</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Nespojen</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23706,7 +24231,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23716,7 +24241,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23727,12 +24252,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23760,7 +24284,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23771,7 +24295,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maximální počet současných stahování:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23781,27 +24305,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Automaticky sdílet příchozí adresář (doporučeno)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23886,7 +24405,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23895,12 +24414,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23925,12 +24439,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Streamování</translation>
     </message>
@@ -23995,7 +24504,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24005,17 +24519,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Upozornění</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24043,7 +24547,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Stahování dokončeno</translation>
     </message>
@@ -24071,19 +24575,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Stahování</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Odesílání</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Jméno</translation>
@@ -24290,12 +24794,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zvolit...</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Přesunout do fronty...</translation>
     </message>
@@ -24320,7 +24819,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zvolte adresář</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24341,7 +24840,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24374,17 +24873,7 @@ p, li { white-space: pre-wrap; }
         <translation>Stahování souboru %1 ještě není dokončeno. Pokud jde o soubor médií (hudba, filmy, ...), můžete se zkusit podívat na jeho náhled.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Upozornění</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Změnit jméno souboru</translation>
     </message>
@@ -24399,7 +24888,7 @@ p, li { white-space: pre-wrap; }
         <translation>Prosím vložte nové--a platné--jméno souboru</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Rozbalit vše</translation>
@@ -24526,18 +25015,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Sloupce</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Cesta</translation>
     </message>
@@ -24547,7 +25041,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24557,7 +25051,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24572,7 +25066,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Kolekce</translation>
     </message>
@@ -24582,7 +25076,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24996,17 +25490,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulář</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25046,27 +25535,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25076,12 +25555,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25218,7 +25697,11 @@ p, li { white-space: pre-wrap; }
         <translation>Stránky Wiki</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Nová skupina</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25233,7 +25716,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25321,7 +25804,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25356,7 +25839,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25386,18 +25869,14 @@ p, li { white-space: pre-wrap; }
         <translation>Štítky</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Historie</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -25418,7 +25897,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25501,7 +25980,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25516,7 +26004,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ostatní</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25536,7 +26024,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25566,17 +26054,25 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>New</source>
+        <translation type="vanished">Nový</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Kontakty</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25639,42 +26135,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulář</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Odebrat</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Umístění:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25719,41 +26208,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">nedostupné</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Neznámý</translation>
@@ -25831,7 +26290,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 r. %2 d.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -25868,7 +26327,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_da.ts b/retroshare-gui/src/lang/retroshare_da.ts
index 4cb8c0823..41f99845c 100644
--- a/retroshare-gui/src/lang/retroshare_da.ts
+++ b/retroshare-gui/src/lang/retroshare_da.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,23 +566,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -625,7 +612,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,7 +699,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+264"/>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -731,6 +718,10 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Annuller</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
@@ -808,7 +799,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,12 +829,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -851,7 +842,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -871,7 +862,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -909,7 +900,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -929,7 +920,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -959,7 +950,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -969,7 +960,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -977,12 +968,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1002,18 +993,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1028,12 +1019,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1202,17 +1193,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1222,17 +1213,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1221,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1263,7 +1244,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1288,18 +1269,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1314,7 +1295,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -1324,7 +1305,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1332,7 +1323,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -1523,7 +1514,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1556,14 +1547,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1571,13 +1561,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,7 +1577,29 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,7 +1609,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1654,12 +1666,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1669,42 +1681,23 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-564"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1714,22 +1707,27 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1744,47 +1742,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1799,7 +1797,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
@@ -1819,7 +1817,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1864,7 +1862,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1879,7 +1877,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1899,7 +1897,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1924,7 +1922,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1954,7 +1952,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1964,7 +1962,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +1986,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,22 +2056,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,17 +2071,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2190,7 +2168,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Forskel på store og små bogstaver</translation>
     </message>
@@ -2296,7 +2274,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2332,7 +2310,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2367,12 +2345,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,6 +2430,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2489,7 +2472,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2511,7 +2494,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2561,7 +2544,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2583,7 +2566,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2598,12 +2581,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2619,12 +2602,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2635,12 +2618,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2660,7 +2643,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,7 +2669,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2708,7 +2691,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2734,7 +2717,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2794,7 +2777,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2810,7 +2793,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2862,45 +2845,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2910,7 +2893,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2992,17 +2975,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3022,7 +3000,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3090,7 +3068,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3106,12 +3084,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
@@ -3121,17 +3099,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,7 +3119,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,22 +3144,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3201,27 +3169,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3267,17 +3240,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3297,12 +3270,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3310,7 +3283,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3350,7 +3323,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3375,7 +3348,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3385,7 +3358,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3424,7 +3397,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3434,7 +3407,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3459,7 +3432,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3472,7 +3445,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3507,7 +3480,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3517,7 +3490,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3582,7 +3560,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3610,7 +3588,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3620,20 +3598,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3643,14 +3618,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3660,8 +3633,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3686,7 +3658,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3978,7 +3950,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3986,8 +3958,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3997,7 +3968,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4033,12 +4004,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4058,7 +4029,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4078,18 +4049,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4104,7 +4075,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Navn:</translation>
     </message>
@@ -4144,19 +4115,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4166,24 +4137,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4193,7 +4152,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4246,13 +4205,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,7 +4230,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4306,7 +4265,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4316,7 +4275,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4461,17 +4420,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4496,12 +4455,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4516,12 +4470,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +4515,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,16 +4525,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+44"/>
+        <location line="+75"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4589,7 +4540,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+21"/>
+        <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 Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+93"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4604,7 +4564,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4634,17 +4594,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4697,7 +4657,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4707,8 +4667,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4731,7 +4691,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4766,7 +4726,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4776,7 +4736,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4791,7 +4751,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4812,7 +4772,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4820,17 +4780,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,12 +4800,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4825,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4875,7 +4840,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,12 +4850,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4870,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4970,33 +4940,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5086,7 +5056,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5754,7 +5724,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5762,38 +5732,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5801,12 +5771,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5968,7 +5938,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5978,7 +5948,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6038,21 +6008,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6174,7 +6134,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6216,7 +6176,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6252,7 +6212,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6268,7 +6228,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6505,7 +6465,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6543,7 +6503,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6554,132 +6514,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Navn</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6762,38 +6606,33 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6811,17 +6650,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6831,12 +6660,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6857,38 +6691,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6908,12 +6742,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6923,43 +6757,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7003,13 +6832,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7019,7 +6848,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7054,7 +6883,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7064,7 +6893,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7074,7 +6908,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7300,13 +7139,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7316,57 +7169,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7374,45 +7209,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7437,7 +7276,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7487,12 +7326,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7616,7 +7455,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7624,7 +7463,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7794,7 +7633,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7807,12 +7646,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7837,7 +7676,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7852,14 +7691,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
@@ -7870,13 +7709,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7889,7 +7728,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8025,7 +7864,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8036,22 +7875,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8071,12 +7910,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8111,22 +7950,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8146,17 +7985,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8169,7 +8008,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8207,18 +8046,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8233,7 +8062,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8248,7 +8077,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8262,11 +8091,6 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8276,7 +8100,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8297,7 +8121,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8359,18 +8183,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8385,17 +8209,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8423,13 +8247,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8499,7 +8323,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8535,7 +8359,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8550,13 +8374,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8571,7 +8395,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8586,7 +8410,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8646,22 +8470,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8736,13 +8550,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8793,17 +8606,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8918,7 +8731,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8931,7 +8744,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8961,7 +8774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -9000,7 +8813,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9024,21 +8837,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9048,7 +8846,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9077,7 +8875,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9108,7 +8906,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9159,7 +8957,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9175,7 +8973,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9194,11 +8992,6 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9228,13 +9021,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9245,7 +9038,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9265,17 +9058,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9288,66 +9081,59 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9357,7 +9143,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9397,23 +9188,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9456,12 +9247,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9491,8 +9282,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9575,12 +9366,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9641,7 +9432,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9661,7 +9452,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9713,7 +9504,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9723,7 +9514,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9738,7 +9529,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9804,12 +9595,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9844,12 +9635,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9860,12 +9651,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9873,7 +9664,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9933,7 +9724,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9956,7 +9747,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,12 +9763,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,23 +9785,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10026,28 +9817,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10057,12 +9842,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10072,7 +9857,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,12 +9932,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10168,22 +9948,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10191,7 +9976,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10251,7 +10036,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10308,12 +10093,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10336,7 +10121,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10349,14 +10134,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10366,7 +10151,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10376,12 +10161,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,14 +10181,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10420,7 +10192,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10468,7 +10240,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10855,7 +10627,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10871,7 +10643,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10890,7 +10662,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10964,7 +10736,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10974,7 +10746,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +10774,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11012,7 +10784,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11022,7 +10794,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11042,37 +10814,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11084,12 +10832,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11104,7 +10852,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11369,14 +11122,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11386,12 +11139,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11401,7 +11154,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11416,27 +11169,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11452,39 +11205,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11504,20 +11247,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11527,78 +11268,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11609,17 +11350,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11634,24 +11375,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11666,12 +11407,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11681,7 +11417,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11756,7 +11492,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11786,7 +11522,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11801,7 +11537,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11849,7 +11585,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11857,7 +11593,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11900,7 +11636,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11980,7 +11716,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11996,12 +11732,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12106,7 +11847,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12156,21 +11897,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12180,7 +11921,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12195,7 +11936,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12210,12 +11951,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12235,12 +11976,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12250,7 +11991,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12258,7 +11999,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12288,13 +12029,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12308,7 +12043,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12318,12 +12053,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12334,27 +12064,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12374,7 +12104,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12384,18 +12114,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12405,7 +12129,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12415,7 +12144,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,15 +12154,10 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12459,7 +12183,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,13 +12193,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12485,7 +12209,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12559,7 +12283,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
@@ -12569,12 +12293,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12597,34 +12321,18 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12642,32 +12350,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12688,12 +12391,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12702,31 +12400,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12736,7 +12429,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12764,7 +12457,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12780,8 +12473,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
@@ -12802,7 +12494,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12813,12 +12505,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12843,12 +12535,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12859,35 +12550,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12902,12 +12589,7 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12937,7 +12619,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12957,7 +12639,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13002,13 +12684,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13023,7 +12704,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13032,17 +12713,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13078,12 +12759,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13098,32 +12779,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13134,32 +12815,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13229,7 +12910,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13269,7 +12950,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13289,18 +12970,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13311,17 +12992,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13341,7 +13012,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13351,21 +13022,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13380,7 +13051,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13390,30 +13061,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13528,13 +13199,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished">Detaljer</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13554,7 +13225,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13575,7 +13246,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13605,18 +13276,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Fra:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13656,13 +13327,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13672,12 +13343,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13755,7 +13426,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13765,7 +13436,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13788,7 +13459,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13796,7 +13467,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13824,7 +13495,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13834,37 +13505,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Fra:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Til:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13904,7 +13575,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13956,7 +13627,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13966,12 +13637,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13981,22 +13652,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14005,24 +13671,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14037,12 +13693,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14142,7 +13798,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14152,16 +13808,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14191,17 +13847,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14232,7 +13888,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14242,7 +13898,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14252,7 +13908,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14261,16 +13917,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14297,12 +13943,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14378,7 +14024,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14392,7 +14038,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14407,28 +14053,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14463,17 +14099,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14527,7 +14153,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14537,7 +14163,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14572,7 +14198,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14713,7 +14339,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14723,7 +14349,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14737,13 +14363,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14776,13 +14396,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14792,12 +14417,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14830,7 +14455,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14851,7 +14476,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14881,19 +14506,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14903,12 +14528,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14918,7 +14543,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15033,7 +14658,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15043,7 +14668,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15150,7 +14775,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15165,7 +14790,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15175,12 +14800,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15418,7 +15043,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15438,12 +15063,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15458,7 +15083,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15469,19 +15094,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15489,7 +15112,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15628,12 +15251,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15678,7 +15296,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Indstillinger</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15724,21 +15347,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15756,7 +15379,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15825,6 +15448,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Måske password er forkert</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15832,12 +15459,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15863,7 +15490,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15884,7 +15511,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
@@ -15924,7 +15551,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15982,7 +15609,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16300,17 +15927,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16339,7 +15966,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16398,19 +16025,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16446,12 +16073,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16662,27 +16289,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16735,7 +16347,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16755,8 +16367,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16781,13 +16393,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16815,12 +16427,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16835,22 +16447,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16866,17 +16468,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16886,7 +16478,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16906,22 +16498,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16936,7 +16518,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16947,7 +16529,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16957,7 +16539,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16965,12 +16547,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17004,7 +16586,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17042,17 +16624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17068,7 +16640,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17083,17 +16655,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17106,18 +16673,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17128,12 +16695,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17143,7 +16710,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17153,17 +16720,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17173,7 +16740,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17183,7 +16750,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -17224,11 +16791,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17247,17 +16821,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17267,15 +16831,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17285,42 +16849,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17340,7 +16904,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17370,17 +16934,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17395,17 +16959,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17415,31 +16974,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17454,7 +17009,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17528,16 +17083,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17627,16 +17172,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17744,7 +17289,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17760,7 +17305,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17795,12 +17340,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17844,27 +17389,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17874,12 +17419,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Fra:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17909,13 +17454,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17927,22 +17472,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17957,7 +17492,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17972,25 +17507,20 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PulseMessage</name>
@@ -18000,7 +17530,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18019,7 +17549,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18029,7 +17559,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18056,7 +17586,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18066,7 +17596,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18086,7 +17616,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18202,7 +17732,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18210,42 +17740,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18277,7 +17802,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18285,8 +17810,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18554,12 +18079,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18590,7 +18115,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18624,7 +18149,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18643,26 +18168,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18742,7 +18247,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18752,7 +18257,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18762,7 +18267,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18778,7 +18283,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18845,7 +18350,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18873,7 +18378,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19053,29 +18558,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Navn</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19318,18 +18807,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19469,7 +18946,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19636,7 +19113,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19649,7 +19126,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19822,22 +19299,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19845,12 +19312,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20538,7 +20005,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Navn</translation>
@@ -20659,7 +20126,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Navn</translation>
     </message>
@@ -20679,7 +20146,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20735,7 +20202,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20749,6 +20216,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20762,11 +20234,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20789,17 +20256,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20823,9 +20285,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20846,7 +20306,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20907,7 +20367,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20928,7 +20388,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20958,7 +20418,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20976,7 +20436,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20993,12 +20453,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21059,7 +20519,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21074,7 +20534,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21174,23 +20634,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,7 +20660,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21237,7 +20697,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -21248,17 +20708,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21278,7 +20738,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21286,7 +20746,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21302,22 +20762,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21334,7 +20794,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21359,8 +20819,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21368,7 +20828,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21399,7 +20859,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21444,12 +20904,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21469,12 +20929,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21484,17 +20949,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21504,7 +20959,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21514,12 +20969,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21578,12 +21033,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Lokale Adresse</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21604,22 +21059,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21632,16 +21087,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21651,46 +21111,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21700,7 +21137,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21725,95 +21162,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21828,7 +21207,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21838,7 +21281,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21850,12 +21308,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21865,7 +21323,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21880,23 +21338,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21907,7 +21365,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21917,7 +21385,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21927,7 +21400,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21967,7 +21450,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21982,7 +21465,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22018,32 +21506,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22098,7 +21561,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22123,7 +21586,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22135,7 +21598,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22158,7 +21621,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22218,28 +21681,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22255,18 +21707,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22301,12 +21753,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22329,22 +21781,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22379,7 +21831,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22389,12 +21841,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22474,7 +21926,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22484,12 +21936,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22508,7 +21960,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22528,17 +21980,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuller</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22548,7 +22000,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22639,7 +22091,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22647,7 +22099,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22698,16 +22150,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22717,7 +22164,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22732,7 +22179,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22748,7 +22195,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22773,7 +22220,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22916,12 +22363,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22945,7 +22392,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Log ind</translation>
     </message>
@@ -23284,7 +22731,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23521,7 +22968,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23557,15 +23004,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23575,13 +23019,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23591,57 +23040,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23649,7 +23053,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23659,7 +23063,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23670,12 +23074,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23703,7 +23106,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23714,7 +23117,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23724,27 +23127,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23829,7 +23227,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23838,12 +23236,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23868,12 +23261,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23938,7 +23326,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23948,17 +23341,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23986,7 +23369,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24014,19 +23397,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Navn</translation>
@@ -24233,12 +23616,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24263,7 +23641,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24284,7 +23662,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24317,17 +23695,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24342,7 +23710,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24469,18 +23837,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24490,7 +23863,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24500,7 +23873,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24515,7 +23888,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24525,7 +23898,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24939,17 +24312,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24989,27 +24357,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25019,12 +24377,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25161,7 +24519,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25176,7 +24534,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25264,7 +24622,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25299,7 +24657,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25329,18 +24687,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25361,7 +24715,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25444,7 +24798,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25459,7 +24818,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25479,7 +24838,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25509,7 +24868,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25519,7 +24878,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25582,42 +24941,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25662,41 +25014,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25774,7 +25096,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25811,7 +25133,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index f33befdf9..8c2ee9aa1 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 e37c020a9..4fa1bb85b 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -56,7 +56,7 @@
     <message>
         <location filename="../gui/AboutWidget.cpp" line="-148"/>
         <source>Max score: %1</source>
-        <translation>Höchstpunktzahl: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+47"/>
@@ -81,7 +81,14 @@
     <message>
         <location line="+793"/>
         <source>Only Hidden Node</source>
-        <translation>Nur Hidden knoten</translation>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Kommentar hinzufügen</translation>
     </message>
 </context>
 <context>
@@ -122,12 +129,12 @@
         <translation>RetroShare: Erweiterte Suche</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Suchkriterien</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Ein weiteres Suchkriterium hinzufügen.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Suchkriterien zurücksetzen.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Bricht die Suche ab.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Suchen</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Album erstellen</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Albumname</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Kategorie:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Tiere</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Familie</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Freunde</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Blumen</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Urlaub</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Landschaften</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Haustiere</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Porträts</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Reise</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Arbeit</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Zufall</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Überschrift:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Wo:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotograf:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beschreibung:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Freigabeeinstellungen</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Richtlinie:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Qualität:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Kommentare</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Identität</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Öffentlich</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Eingeschränkt</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Bildgröße ändern (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Bildgröße ändern (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Originalbilder senden</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Keine Kommentare erlaubt</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Authentifizierte Kommentare</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Jegliche Kommentare erlaubt</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Mit Identität veröffentlichen</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Füge Bilder per Drag &apos;n&apos; Drop ein. Klicke auf ein Bild, um die darunter stehenden Details zu bearbeiten.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Zurück</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Fotos hinzufügen</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Album veröffentlichen</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Albumtitel entfernen</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Sage etwas über dieses Album...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Wo wurden diese aufgenommen?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Albumvorschau laden</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Album</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Albumvorschau</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Zusammenfassung</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -178,13 +364,41 @@
     <message>
         <location line="-14"/>
         <source>Category:</source>
-        <translation>Kategorie:</translation>
+        <translation>Kategorie</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Caption</source>
         <translation>Überschrift</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Wo:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Wann:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beschreibung</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Freigabeeinstellungen</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Kommentare</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Veröffentlichungsidentität</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Sichtbarkeit</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -224,57 +438,57 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/PhotoShare/AlbumExtra.ui" line="+20"/>
         <source>Form</source>
-        <translation>Formular</translation>
+        <translation type="unfinished">Formular</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Quality:</source>
-        <translation>Qualität:</translation>
+        <translation type="unfinished">Qualität:</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Embedded Only (&lt;50Kb)</source>
-        <translation>Nur eingebettet (&lt;50 KB)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Share Original Images</source>
-        <translation>Orginal Bild teilen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Copy Original Images (extra disk space)</source>
-        <translation>Originalbilder kopieren (zusätzlicher Speicherplatz)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Resize Images (&lt; 200Kb)</source>
-        <translation>Bildgröße ändern (&lt; 10Mb) {200K?}</translation>
+        <translation type="unfinished">Bildgröße ändern (&lt; 10Mb) {200K?}</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Resize Images (&lt; 1Mb)</source>
-        <translation>Bildgröße ändern (&lt; 1Mb)</translation>
+        <translation type="unfinished">Bildgröße ändern (&lt; 1Mb)</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Caption:</source>
-        <translation>Überschrift:</translation>
+        <translation type="unfinished">Überschrift:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Photographer:</source>
-        <translation>Fotograf:</translation>
+        <translation type="unfinished">Fotograf:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Where:</source>
-        <translation>Wo:</translation>
+        <translation type="unfinished">Wo:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>When:</source>
-        <translation>Wann:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -282,37 +496,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/PhotoShare/AlbumGroupDialog.cpp" line="+81"/>
         <source>Create New Album</source>
-        <translation>Neues Album erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create</source>
-        <translation>Erstellen</translation>
+        <translation type="unfinished">Erstellen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Album</source>
-        <translation>Album</translation>
+        <translation type="unfinished">Album</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Edit ALbum</source>
-        <translation>Album bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update Album</source>
-        <translation>Album aktualisieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Album Admins</source>
-        <translation>Album-Administratoren hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select Album Admins</source>
-        <translation>Album-Admins auswählen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -421,7 +635,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+14"/>
         <source>Choose the style of Tool Buttons.</source>
-        <translation>Wähle den Stil für die Werkzeugschaltflächen.</translation>
+        <translation>Wähle den Stil für die Werkzeugschaltflächen</translation>
     </message>
     <message>
         <location line="+21"/>
@@ -456,22 +670,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+12"/>
         <source>Show Toaster Disable</source>
-        <translation>Toaster-Deaktivierung anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Show Sound Status</source>
-        <translation>Sound Status anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Show Network Rate Status</source>
-        <translation>Netzwerkrate anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Show Discovery Status</source>
-        <translation>Entdeckungsstatus anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+59"/>
@@ -481,7 +695,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-52"/>
         <source>Show Hashing Status</source>
-        <translation>Hashing Status anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+38"/>
@@ -491,17 +705,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-31"/>
         <source>Show Peer Status</source>
-        <translation>Peer Status anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Show Status ComboBox</source>
-        <translation>Status ComboBox anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Remove surplus text in status bar.</source>
-        <translation>Überschüssigen Text aus Statusleiste entfernen.</translation>
+        <translation>Überschüssigen Text aus Statusleiste entfernen</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -511,7 +725,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+21"/>
         <source>Show Operating Mode Status</source>
-        <translation>Betriebsmodusstatus anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
@@ -521,12 +735,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-28"/>
         <source>Disable SysTray ToolTip</source>
-        <translation>SysTray Kurzinfo deaktivieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-225"/>
         <source>Main page items:</source>
-        <translation>Hauptseitenelemente:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
@@ -536,7 +750,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Item list</source>
-        <translation>Item Liste</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+104"/>
@@ -553,10 +767,10 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
-        <translation> Warnung: Diese Dienste sind experimentell. Bitte hilf uns sie zu testen.
+        <translation>Warnung: Diese Dienste sind experimentell. Bitte hilf uns sie zu testen.
 Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Protokolle ändern.</translation>
     </message>
     <message>
@@ -569,6 +783,14 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <source>Circles</source>
         <translation>Kreise</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">Gxs-Foren</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">Gxs-Kanäle</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <translation>Fotos</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation>Bild speichern</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation>Bild kopieren</translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p KiB</translation>
     </message>
@@ -621,7 +830,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+52"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -631,7 +840,11 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+10"/>
         <source>Browse...</source>
-        <translation>Durchsuchen...</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Avatar hinzufügen</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -639,24 +852,28 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Dein Avatarbild festlegen</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Import image</source>
-        <translation>Bild importieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Image files (*.jpg *.png);;All files (*)</source>
-        <translation>Bilddateien (*.jpg *.png);;Alle Dateien (*)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
-        <translation>Benutzen Sie die Maus, um das Bild für Ihren Avatar zu vergrößern und anzupassen.</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Avatar laden</translation>
     </message>
 </context>
 <context>
@@ -693,22 +910,22 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+47"/>
         <source>PushButton</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Up</source>
-        <translation>Hoch</translation>
+        <translation type="unfinished">Hoch</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Down</source>
-        <translation>Herunter</translation>
+        <translation type="unfinished">Herunter</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Clears the graph</source>
-        <translation>Grafik zurücksetzen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -718,7 +935,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+23"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
         <location line="-30"/>
@@ -726,10 +943,22 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Empfangsrate</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Senderate</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Immer im Vordergrund</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stil</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <source>% Opaque</source>
         <translation>% undurchsichtig</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Speichern</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Abbrechen</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Seit:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Einstellungen verbergen</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -783,7 +1024,7 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+9"/>
         <source>Total</source>
-        <translation>Insgesamt</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -796,275 +1037,275 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+26"/>
         <source>Filename</source>
-        <translation>Dateiname</translation>
+        <translation type="unfinished">Dateiname</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hash</source>
-        <translation>Prüfsumme</translation>
+        <translation type="unfinished">Prüfsumme</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Size</source>
-        <translation>Größe</translation>
+        <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Banned since...</source>
-        <translation>Gesperrt seit...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/FileTransfer/BannedFilesDialog.cpp" line="+64"/>
         <source>Remove</source>
-        <translation>Entfernen</translation>
+        <translation type="unfinished">Entfernen</translation>
     </message>
 </context>
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
-        <translation>Kommentar</translation>
+        <translation type="unfinished">Kommentar</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>1 comment</source>
-        <translation>1 Kommentar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1 comments</source>
-        <translation>%1 Kommentare</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>No comments yet. Click to add one.</source>
-        <translation>Noch keine Kommentare. Klicken Sie, um einen hinzuzufügen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+85"/>
         <source>Loading</source>
-        <translation>Lade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
-        <translation>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Der Autor dieser Nachricht (mit der ID %1) ist gesperrt.&lt;/b&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
-        <translation>vor</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
-        <translation>Daumen hoch</translation>
+        <translation type="unfinished">Daumen hoch</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>0</source>
-        <translation>0</translation>
+        <translation type="unfinished">0</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Vote down</source>
-        <translation>Daumen runter</translation>
+        <translation type="unfinished">Daumen runter</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>\/</source>
-        <translation>\/</translation>
+        <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
-        <translation>Gepostet von</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Toggle Message Read Status</source>
-        <translation>Lesestatus der Nachricht umschalten</translation>
+        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="unfinished">Neu</translation>
     </message>
     <message>
         <location line="+60"/>
         <source>PictureLabel</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+25"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Comments</source>
-        <translation>Kommentare</translation>
+        <translation type="unfinished">Kommentare</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Share</source>
-        <translation>Teilen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
-        <translation>Daumen hoch</translation>
+        <translation type="unfinished">Daumen hoch</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>0</source>
-        <translation>0</translation>
+        <translation type="unfinished">0</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Vote down</source>
-        <translation>Daumen runter</translation>
+        <translation type="unfinished">Daumen runter</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>\/</source>
-        <translation>\/</translation>
+        <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
-        <translation>Zum Betrachten des Bildes anklicken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>PictureLabel_compact</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Posted by</source>
-        <translation>Gepostet von</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Comments</source>
-        <translation>Kommentare</translation>
+        <translation type="unfinished">Kommentare</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Expand</source>
-        <translation>Erweitern</translation>
+        <translation type="unfinished">Erweitern</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Share</source>
-        <translation>Teilen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
-        <translation>Lesestatus der Nachricht umschalten</translation>
+        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="unfinished">Neu</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
 </context>
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
-        <translation>Das gefällt mir</translation>
+        <translation type="unfinished">Das gefällt mir</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
-        <translation>0</translation>
+        <translation type="unfinished">0</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>I dislike this</source>
-        <translation>Das gefällt mir nicht</translation>
+        <translation type="unfinished">Das gefällt mir nicht</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Toggle Message Read Status</source>
-        <translation>Lesestatus der Nachricht umschalten</translation>
+        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Avatar</source>
-        <translation>Avatar</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>New Comment</source>
-        <translation>Neuer Kommentar</translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">Avatar</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <source>New Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Copy RetroShare Link</source>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
-        <translation>Erweitern</translation>
+        <translation type="unfinished">Erweitern</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Set as read and remove item</source>
-        <translation>Als gelesen markieren und Eintrag entfernen</translation>
+        <translation type="unfinished">Als gelesen markieren und Eintrag entfernen</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Remove Item</source>
-        <translation>Eintrag entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="-116"/>
         <source>Comment</source>
-        <translation>Kommentar</translation>
+        <translation type="unfinished">Kommentar</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Comments </source>
-        <translation>Kommentare </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
-        <translation>Verbergen</translation>
+        <translation type="unfinished">Verbergen</translation>
     </message>
 </context>
 <context>
@@ -1185,83 +1426,77 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
     <message>
         <location line="+10"/>
         <source>Legend:</source>
-        <translation>Legende:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Current</source>
-        <translation>Aktuell</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Total</source>
-        <translation>Gesamt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Log scale</source>
-        <translation>Log skalieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Default</source>
-        <translation>Standard</translation>
+        <translation type="unfinished">Standard</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Dark</source>
-        <translation>Dunkel</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Kanäle</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Load Emoticons</source>
-        <translation>Emoticons laden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Beiträge im Hintergrund laden (Thread)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation>Maximale Größe des automatischen Downloads (in GB)</translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
-        <translation>Jeden Kanal in einem neuen Reiter öffnen</translation>
+        <translation>Jeden Kanal in einem neuen Reiter öffnen.</translation>
     </message>
 </context>
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
-        <translation>Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>file</source>
-        <translation>Datei</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1271,84 +1506,92 @@ Aber denke daran, dass alle Daten hier VERLOREN gehen werden, wenn wir die Proto
         <source>Use mouse to center and zoom
 into the image, so as to
  crop it for your post.</source>
-        <translation>Benutzen Sie die Maus zum Zentrieren und Zoomen
-in das Bild hinein, um es für
- um es für Ihren Beitrag anzupassen.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
-        <translation>Das gefällt mir</translation>
+        <translation type="unfinished">Das gefällt mir</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>0</source>
-        <translation>0</translation>
+        <translation type="unfinished">0</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>I dislike this</source>
-        <translation>Das gefällt mir nicht</translation>
+        <translation type="unfinished">Das gefällt mir nicht</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Toggle Message Read Status</source>
-        <translation>Lesestatus der Nachricht umschalten</translation>
+        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Avatar</source>
-        <translation>Avatar</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>New Comment</source>
-        <translation>Neuer Kommentar</translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">Avatar</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <source>New Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Copy RetroShare Link</source>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
-        <translation>Erweitern</translation>
+        <translation type="unfinished">Erweitern</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Set as read and remove item</source>
-        <translation>Als gelesen markieren und Eintrag entfernen</translation>
+        <translation type="unfinished">Als gelesen markieren und Eintrag entfernen</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Remove Item</source>
-        <translation>Artikel entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Comm value</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
-        <translation>Verbergen</translation>
+        <translation type="unfinished">Verbergen</translation>
     </message>
 </context>
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
@@ -1365,7 +1608,7 @@ in das Bild hinein, um es für
     <message>
         <location line="+1"/>
         <source>Ban this person (Sets negative opinion)</source>
-        <translation>Diese Person verbannen (setzt negative Meinung)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1415,12 +1658,12 @@ in das Bild hinein, um es für
     <message>
         <location line="+1"/>
         <source>This participant is not active since:</source>
-        <translation>Teilnehmer inaktiv seit:</translation>
+        <translation>Teilnehmer inaktiv seit: </translation>
     </message>
     <message>
         <location line="+2"/>
         <source> seconds</source>
-        <translation> Sekunden</translation>
+        <translation>Sekunden</translation>
     </message>
     <message>
         <location line="-555"/>
@@ -1430,17 +1673,17 @@ in das Bild hinein, um es für
     <message>
         <location line="-2"/>
         <source>Give neutral opinion</source>
-        <translation>Neutrale Meinung abgeben</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Give positive opinion</source>
-        <translation>Eine positive Meinung abgeben</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show author in people tab</source>
-        <translation>Autor auf der Registerkarte Personen anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
@@ -1450,18 +1693,18 @@ in das Bild hinein, um es für
     <message>
         <location line="+67"/>
         <source>Leave this chat room (Unsubscribe)</source>
-        <translation>Diesen Chatraum verlassen (Abmelden)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+197"/>
         <source>Welcome to chat room %1</source>
-        <translation>Willkommen im Chatraum %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+164"/>
         <location line="+2"/>
         <source>Room chat</source>
-        <translation>Chatraum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+191"/>
@@ -1508,7 +1751,7 @@ in das Bild hinein, um es für
         <location line="+5"/>
         <location line="+21"/>
         <source>Chat room management</source>
-        <translation>Chatraum-Verwaltung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-21"/>
@@ -1523,23 +1766,23 @@ in das Bild hinein, um es für
     <message>
         <location line="+0"/>
         <source>Do you want to unsubscribe to this chat room?</source>
-        <translation>Möchten Sie sich von diesem Chatraum abmelden?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+75"/>
         <source>Redock to Main window</source>
-        <translation>Zurückdocken zum Hauptfenster</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Undock to a new window</source>
-        <translation>Abdocken in ein neues Fenster</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Chatlobby anzeigen</translation>
     </message>
@@ -1551,35 +1794,50 @@ in das Bild hinein, um es für
         <source>Chats</source>
         <translation>Chats</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Du hast %1 neue Nachrichten</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Du hast %1 neue Nachricht</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 neue Nachrichten</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 neue Nachricht</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
-        <translation>Sie haben %1 Erwähnungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 mention</source>
-        <translation>Sie haben %1 Erwähnung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 mentions</source>
-        <translation>%1 Erwähnungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 mention</source>
-        <translation>%1 Erwähnung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Unbekannte Lobby</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Alle entfernen</translation>
     </message>
@@ -1587,13 +1845,13 @@ in das Bild hinein, um es für
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Anzahl</translation>
     </message>
@@ -1603,7 +1861,29 @@ in das Bild hinein, um es für
         <translation>Thema</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Private Chaträume</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Öffentliche Chaträume</translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Chatraum erstellen</translation>
     </message>
@@ -1613,14 +1893,14 @@ in das Bild hinein, um es für
         <translation>Diesen Raum verlassen</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Create an identity and enter this chat room</source>
-        <translation>Erstellen Sie eine Identität und betreten Sie diesen Chatraum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1630,12 +1910,12 @@ in das Bild hinein, um es für
     <message>
         <location line="+5"/>
         <source>Enter this chat room as...</source>
-        <translation>Diesen Chatraum betreten als...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+516"/>
@@ -1670,12 +1950,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
-        <translation>%1 lädt dich in den Chatraum namens %2 ein</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1685,31 +1965,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Chatlobby erstellen</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Kein Thema angegeben]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Info zur ausgewählten Lobby</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Privat</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Öffentlich</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>Anonyme Kennungen akzeptiert</translation>
     </message>
@@ -1719,25 +1999,42 @@ Double click a chat room to enter and chat.</source>
         <translation>Autom. Abonnement entfernen</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Autom. Abonnement hinzufügen</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Chatlobbys durchsuchen</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Name durchsuchen</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Abonniert</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Spalten</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Nein</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1749,47 +2046,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Chatraumname:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>Chatraumkennung:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Thema:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Sicherheit:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Nachbarn:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
@@ -1804,24 +2101,13 @@ Double click a chat room to enter and chat.</source>
         <translation>Keine anonymen Kennungen</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation>Privat abonniert</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation>Öffentlich abonniert</translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>Spalte</translation>
@@ -1835,7 +2121,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Eintrag entfernen</translation>
     </message>
@@ -1880,22 +2166,46 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Fernchat</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Jeder</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Kontakte</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Niemand</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Verschlüsselten Fernchat annehmen von</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Chat-Einstellungen</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Emoticons für privaten Chat</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Emoticons für Gruppenchat</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Angepasste Schriftarten aktivieren</translation>
     </message>
@@ -1904,6 +2214,10 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>Angepasste Schriftgröße aktivieren</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Minimale Schriftgröße</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1915,9 +2229,9 @@ Double click a chat room to enter and chat.</source>
         <translation>Kursivschrift aktivieren</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
-        <translation>Allgemeine Einstellungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1940,14 +2254,22 @@ Double click a chat room to enter and chat.</source>
         <translation>Eingebettete Bilder laden</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Chatlobby</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Blinkendes Reitersymbol</translation>
     </message>
     <message>
         <location line="-7"/>
         <source>Do not send typing notifications</source>
-        <translation>Senden Sie keine Tippbenachrichtigungen</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Privater Chat</translation>
     </message>
     <message>
         <location line="+206"/>
@@ -1970,7 +2292,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Blinkendes Fenster/Reitersymbol</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Chat-Schriftart</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Chat-Schriftart wählen</translation>
     </message>
@@ -1980,10 +2306,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Chat-Schriftart:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Verlauf</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stil</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1998,15 +2328,19 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation>Variante:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Gruppenchat</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Privater Chat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
-        <translation>Wählen Sie Ihre Standardschriftart für Chat.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -2061,152 +2395,140 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+0"/>
         <source>/me is sending a message with /me</source>
-        <translation>/me sendet eine Nachricht mit /me</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+237"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In diesem Tab kannst du für die verschiedenen Chatsysteme festlegen, wieviele Nachrichten RetroShare auf Festplatte gespeichert hält, und wieviel der vorangehenden Unterhaltung angezeigt wird. Die maximale Speicherzeit erlaubt das Verwerfen alter Nachrichten und verhindert das unberechenbare Füllen des Unterhaltungsverlaufs (z. B. Chatlobbys und Fernchat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Chatlobbys</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Aktiviert:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation>Wenn Sie sich auf den Textbrowser konzentrieren, nachdem Sie den Chatraum angezeigt haben</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation>Textbearbeitungsfeld verkleinern, wenn es nicht benötigt wird</translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
-        <translation>Schriftarten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+97"/>
         <source>Minimum displayed font size</source>
-        <translation>Angezeigte Mindestschriftgröße</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation>Wenn Ihr System richtig eingerichtet ist, sollte dieses nächste Quadrat 1 cm messen.</translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation>Dieses nächste Quadrat wird entsprechend der Schriftgröße Ihres Systems skaliert.</translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
-        <translation>Chaträume</translation>
+        <translation type="unfinished">Chaträume</translation>
     </message>
     <message>
         <location line="-470"/>
         <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
-        <translation>Überprüft, ob die Identität und der Text über den Vorkommen in derselben Groß-/Kleinschreibung vorliegen müssen, um die Zählung auszulösen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Case sensitive search</source>
-        <translation>Groß- und Kleinschreibung beachten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Default identity for chat rooms:</source>
-        <translation>Standardidentität für Chatrooms:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Count all unread messages</source>
-        <translation>Alle ungelesenen Nachrichten zählen</translation>
+        <translation type="unfinished">Alle ungelesenen Nachrichten zählen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Count occurrences of my current identity</source>
-        <translation>Zähle Vorkommen meiner aktuellen Identität</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Count occurrences of any of the following texts (separate by newlines):</source>
-        <translation>Zählen Sie das Vorkommen eines der folgenden Texte (getrennt durch Zeilenumbrüche):</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+66"/>
         <location line="+202"/>
         <location line="+451"/>
         <source>Author:</source>
-        <translation>Autor:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-629"/>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation>Beschreibung:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-605"/>
         <source>Accept chat from:</source>
-        <translation>Akzeptiere Chat von:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Contacts only</source>
-        <translation>Nur Kontakte</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
         <location line="+137"/>
         <source>Enable Emoticons</source>
-        <translation>Emoticons aktivieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-6"/>
         <location line="+107"/>
         <source>Broadcast</source>
-        <translation>Rundschreiben</translation>
+        <translation type="unfinished">Rundschreiben</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>Node-to-node chat</source>
-        <translation>Knoten-Chat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Saved messages (0 = unlimited):</source>
-        <translation>Gespeicherte Nachrichten (0 = unbegrenzt):</translation>
+        <translation>Gespeicherte Nachrichten (0 = unbegrenzt)</translation>
     </message>
     <message>
         <location line="+62"/>
         <source>Number of messages restored  (0 = off):</source>
-        <translation>Anzahl wiederhergestellter Nachrichten (0 = aus):</translation>
+        <translation>Anzahl wiederhergestelter Nachrichten (0 = aus)</translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Distant chat</source>
-        <translation>Distant-Chat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Maximum storage period, in days (0=keep all):</source>
-        <translation>Maximale Speicherzeit in Tagen (0 = alle behalten):</translation>
+        <translation>Maximale Speicherzeit in Tagen (0 = alle behalten)</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Suchgrundeinstellung</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Groß-/Kleinschreibung unterscheiden</translation>
     </message>
@@ -2245,6 +2567,10 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation>Grenzwert für automatische Suche</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Standardidentität für Chatlobbys</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2273,7 +2599,7 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location filename="../gui/settings/ChatPage.h" line="+44"/>
         <source>Chats</source>
-        <translation>Chats</translation>
+        <translation type="unfinished">Chats</translation>
     </message>
 </context>
 <context>
@@ -2312,7 +2638,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Chat anzeigen</translation>
     </message>
@@ -2327,40 +2653,40 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+28"/>
         <source>You have %1 mentions</source>
-        <translation>Sie haben %1 Erwähnungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 mention</source>
-        <translation>Sie haben %1 Erwähnung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 mentions</source>
-        <translation>%1 Erwähnungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 mention</source>
-        <translation>%1 Erwähnung</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
         <location line="+207"/>
         <source>Insert sticker</source>
-        <translation>Sticker einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+69"/>
         <source>Set font &amp; color</source>
-        <translation>Schriftart und Farbe einstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+69"/>
@@ -2383,14 +2709,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat-Menü&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
-        <translation>Emoticon einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+49"/>
@@ -2468,10 +2794,15 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation>Horizontale Linie einfügen</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Bild speichern</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
-        <translation>Sticker importieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
@@ -2487,7 +2818,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+12"/>
         <location line="+3"/>
         <source>Don&apos;t replace tag with Emote Icon.</source>
-        <translation>Ersetzen Sie den Tag nicht durch das Emote-Symbol.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2497,15 +2828,15 @@ Double click a chat room to enter and chat.</source>
     <message>
         <location line="+12"/>
         <source>Send as CommonMark</source>
-        <translation>Als CommonMark senden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Text will be formatted using CommonMark.</source>
-        <translation>Der Text wird mit CommonMark formatiert.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>tippt...</translation>
     </message>
@@ -2520,16 +2851,15 @@ nach der HTML-Konvertierung.</translation>
         <location line="+2"/>
         <source>Warning: This message is too big of %1 characters
 after HTML conversion.</source>
-        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß
-nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+274"/>
         <source>Choose your font.</source>
-        <translation>Wählen Sie Ihre Schriftart.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Möchtest du wirklich den Nachrichtenverlauf löschen?</translation>
     </message>
@@ -2561,7 +2891,7 @@ nach der HTML-Konvertierung.</translation>
     <message>
         <location line="+0"/>
         <source>Messages you send will be delivered after Friend is again Online.</source>
-        <translation>Die von Ihnen gesendeten Nachrichten werden zugestellt, sobald Ihr Freund wieder online ist.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2579,7 +2909,7 @@ nach der HTML-Konvertierung.</translation>
         <translation>antwortet möglicherweise nicht, da der Status auf &quot;Beschäftigt&quot; gesetzt wurde</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Unter Berücksichtigung von Groß-/Kleinschreibung suchen</translation>
     </message>
@@ -2601,7 +2931,7 @@ nach der HTML-Konvertierung.</translation>
         <translation>Nach Finden von X Elementen mit dem Einfärben nicht aufhören (benötigt mehr CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Vorherige finden &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Strg+Umschalt+G&lt;/i&gt;</translation>
     </message>
@@ -2616,12 +2946,16 @@ nach der HTML-Konvertierung.</translation>
         <translation>&lt;b&gt;Finden &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Strg+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Status)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Schriftart &amp; Textfarbe festlegen</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Datei anhängen</translation>
     </message>
@@ -2637,31 +2971,30 @@ nach der HTML-Konvertierung.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Markiere diesen ausgewählten Text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Strg+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
-        <translation>Personen-ID: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 Double click on it to add his name on text writer.</source>
-        <translation>
-Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
-        <translation> Nicht signiert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
-        <translation> Elemente gefunden.</translation>
+        <translation>Elemente gefunden.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -2679,7 +3012,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>Hier eine Nachricht eingeben</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Nach Finden von</translation>
     </message>
@@ -2705,9 +3038,9 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
-        <translation>Detailanzeige: </translation>
+        <translation>Detailanzeige:</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -2727,7 +3060,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Persönliche Kreise</translation>
     </message>
@@ -2753,7 +3086,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Freunde</translation>
     </message>
@@ -2813,7 +3146,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>Freunde von Freunden</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Externe Kreise (Admin)</translation>
     </message>
@@ -2829,7 +3162,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Kreise</translation>
     </message>
@@ -2860,7 +3193,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     <message>
         <location line="+187"/>
         <source>Current address:</source>
-        <translation>Aktuelle Adresse:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
@@ -2881,52 +3214,47 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Fehler: Kann Nachbardetails nicht ermitteln.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
-        <translation>&lt;p&gt;Diese Retroshare-ID enthält:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Sie können diese Retroshare ID verwenden, um neue Freunde zu bekommen. Schicken Sie sie per E-Mail, oder geben Sie sie von Hand zu Hand.&lt;/p&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/connect/ConfCertDialog.ui" line="-212"/>
@@ -2934,7 +3262,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>Verschlüsselung</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>Nicht verbunden</translation>
     </message>
@@ -2981,12 +3309,12 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     <message>
         <location line="+59"/>
         <source>Connectivity</source>
-        <translation>Konnektivität</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+95"/>
         <source>List of known addresses:</source>
-        <translation>Liste bekannter Adressen:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -2997,12 +3325,12 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     <message>
         <location line="+18"/>
         <source>short format</source>
-        <translation>Kurzformat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Include IP history</source>
-        <translation>IP-Verlauf einbeziehen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-104"/>
@@ -3016,17 +3344,25 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>keine</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Dieses Zertifikat enthält:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;eine &lt;b&gt;Netzknoten-ID&lt;/b&gt; und &lt;b&gt;Name&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">eine &lt;b&gt;Onion-Adresse&lt;/b&gt; und &lt;b&gt;Port&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">eine &lt;b&gt;IP-Adresse&lt;/b&gt; und &lt;b&gt;Port&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>Du kannst dieses Zertifikat zum Schließen von neuen Freundschaften verwenden. Versende es per E-Mail oder gib es von Hand zu Hand.</translation>
     </message>
@@ -3041,7 +3377,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dies ist die Verschlüsselungsmethode die von &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt; benutzt wird. Die Verbindung zu befreundeten Netzknoten ist immer stark verschlüsselt.&lt;/p&gt;&lt;p&gt;Und wenn DHE vorhanden ist dann verwendet die Verbindung noch dazu&lt;/p&gt;&lt;p&gt;&amp;quot;Perfect Forward Secrecy&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>mit</translation>
     </message>
@@ -3058,16 +3394,104 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <source>Connect Friend Wizard</source>
         <translation>Assistent um sich zu einem Freund zu verbinden</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Einen neuen Freund hinzufügen</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Du hast eine Datei mit einem Zertifikat deines Freund bekommen</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">Ausgewählte Freunde von Freunden hinzu&amp;fügen</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Signaturen einschließen</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Dein Zertifikat in die Zwischenablage kopieren</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Zertifikat als Datei speichern</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Das Standard-E-Mailprogramm starten</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
-        <translation>Öffnen Sie das Zertifikat Ihres Freundes von der Datei</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Zertifikat-Dateien</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">In Dateien gespeicherte PGP Zertifikate benutzen.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Zertifikat eines Freundes importieren...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Du musst eine Datei mit deinem Zertifikat erstellen und deinem Freund zukommen lassen. Alternativ kannst Du auch eine Datei verwenden, die Du zuvor erstellt hast.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Mein Zertifikat exportieren...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Gib die Datei mit dem Zertifikat ein oder ziehe sie per Drag&apos;n&apos;Drop in das Fenster</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Durchsuchen</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Freunde von Freunden</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Wähle nun aus, wen du als Freund hinzufügen möchtest.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Zeige mir: </translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Diese Nachbarn zu deinen Freunden hinzufügen</translation>
     </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare-ID</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">RetroShare-ID benutzen, um einen Freund aus deinem Netzwerk hinzuzufügen.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">RetroShare-ID des Freundes einfügen...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">RetroShare-ID des Freundes in das Feld unten einfügen</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">RetroShare-ID des Freundes eingeben, z. B. Nachbar@BDE8D16A46D938CF </translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3076,7 +3500,7 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     <message>
         <location line="+3"/>
         <source>Invite your Friends from other Networks to RetroShare.</source>
-        <translation>Laden Sie Ihre Freunde aus anderen Netzwerken zu RetroShare ein.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
@@ -3109,7 +3533,27 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>E-Mail</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Freunde per E-Mail einladen</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Gib die E-Mail-Adressen deines Freundes an (mehrere Adressen müssen mit Semikolon getrennt werden)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">E-Mail-Adresse deines Freundes:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Gib die E-Mail-Adresse deines Freundes ein</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Betreff:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3125,32 +3569,60 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>Details der Anfrage</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Nachbardetails</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">E-Mail:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Netzknoten:</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Zertifikat manuell eingeben</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">RetroShare-Kennung manuell eingeben</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Viele Freunde einander empfehlen</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">RetroShare-Zertifikat</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Zertifikat einfügen</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Freund zur Gruppe hinzufügen:</translation>
     </message>
@@ -3160,54 +3632,48 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>Freund authentifizieren (PGP-Schlüssel unterzeichnen)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
-        <translation>Bitte fügen Sie unten die Retroshare-ID Ihres Freundes ein</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Paste ID of your friend from Clipboard</source>
-        <translation>ID eines Freundes aus der Zwischenablage einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Paste</source>
-        <translation>Einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Open</source>
-        <translation>Öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Please, paste your friend&apos;s Retroshare ID into the box below</source>
-        <translation>Bitte fügen Sie die Retroshare-ID Ihres Freundes in das unten stehende Feld ein</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation>Unterzeichner:</translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation>Bekannte IP:</translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Als Freund hinzufügen, zu dem verbunden wird</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Abschließen-Knopf anklicken, um die Anfrage zu akzeptieren</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Entschuldigung, es trat ein Fehler auf</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Here is the error message:</source>
-        <translation>Dies ist die Fehlermeldung:</translation>
+        <translation>Dies ist die Fehlermeldung: </translation>
     </message>
     <message>
         <location line="+17"/>
@@ -3220,34 +3686,39 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
         <translation>Details über deinen Freund:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Schlüssel-Gültigkeit:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Unterzeichner</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Dieser Nachbar ist bereits in deiner Freundliste vorhanden. Das nochmalige Hinzufügen ändert nur seine IP.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
-        <translation>Um die Freundschaftsanfrage anzunehmen, klicken Sie auf die Schaltfläche Annehmen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-123"/>
         <source>Abnormal size read is bigger than memory block.</source>
-        <translation>Größe der eingehenden Daten ist größer als Speicherblock.</translation>
+        <translation>Größe der eingehenden Daten ist größer als Speicherblock</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3286,17 +3757,49 @@ Doppelklicken Sie darauf, um seinen Namen im Textschreiber hinzuzufügen.</trans
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Das Zertifikat konnte nicht geladen werden</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Kann Nachbardetails von PGP-Schlüssel %1 nicht abrufen</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Jeden Nachbarn, den ich nicht unterzeichnet habe</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Freunde meiner Freunde, welche mir schon vertrauen</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Unterzeichnete Nachbarn, die geblockt sind</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Nachbarname</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Auch unterzeichnet von</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Nachbar-ID</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">Zertifikat scheint gültig zu sein</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Kein gültiges RetroShare-Zertifikat!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare-Einladung</translation>
     </message>
@@ -3316,27 +3819,27 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
         <source>Accept</source>
-        <translation>Akzeptieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>You have already signed this key</source>
-        <translation>Sie haben diesen Schlüssel bereits unterzeichnet</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3369,42 +3872,82 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Du hast eine Freundschaftsanfrage von</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Identity creation failed</source>
-        <translation>Identitätserstellung fehlgeschlagen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
-        <translation>Ohne Ihr Profilpasswort können Sie keine mit Ihrem Profil verknüpfte Identität erstellen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Signature failed</source>
-        <translation>Unterschrift fehlgeschlagen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Signature failed. Uncheck the key signature box if you want to make friends without signing the friends&apos; certificate</source>
-        <translation>Signatur fehlgeschlagen. Deaktivieren Sie das Kontrollkästchen für die Schlüsselsignatur, wenn Sie Freundschaften schließen möchten, ohne das Zertifikat der Freunde zu signieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
-        <translation>Gültige Retroshare-ID</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Valid certificate</source>
-        <translation>Gültiges Zertifikat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Fehler beim Laden des Zertifikats: Datei %1 nicht gefunden</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Der Nutzer %1 ist nicht in deinem Netzwerk verfügbar</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Neues Zertifikatsformat benutzen (sicherer und robuster)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Altes (rückwärtskompatibles) Zertifikatsformat benutzen</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Signaturen entfernen</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">RetroShare-Einladung</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Verbindungshilfe</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Du kannst diesen Text kopieren und an deinen Freund per E-Mail senden oder über einen anderen Weg zukommen lassen</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Dein Zertifikat wurde in die Zwischenablage kopiert. Du kannst es per E-Mail oder auf andere Weise an deinen Freund senden.</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Speichern unter...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3443,7 +3986,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Keine ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Wenn verfügbar als direkte Quelle nutzen</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>IP-Adr.:</translation>
     </message>
@@ -3453,7 +4000,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP-Adresse</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Erweiterte Optionen anzeigen</translation>
     </message>
@@ -3472,13 +4019,41 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Viele Freunde einander empfehlen</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Freundempfehlungen</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Nachricht:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Freunde empfehlen</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">An</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Bitte mindestens einen Freund als Empfehlung wählen.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Bitte mindestens einen Empfänger wählen.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Schlüssel zum Schlüsselbund hinzufügen.</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Schlüssel ist bereits in deinem Schlüsselbund.</translation>
     </message>
@@ -3492,7 +4067,7 @@ even if you don&apos;t make friends.</source>
 Selbst wenn ihr euch nicht anfreundet, könnte es nützlich sein, um Fernnachrichten an diesen Teilnehmer zu senden.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>
 Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netze inkompatibel sind.</translation>
@@ -3528,7 +4103,7 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
         <translation>IP zu Whitelist hinzufügen</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>Zertifikat enthält keine IP!</translation>
     </message>
@@ -3538,10 +4113,27 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
         <translation>&lt;p&gt;Dieses Zertifikat enthält keine IP. Du wirst auf Discovery und DHT angewiesen sein un sie herauszufinden. Da du  Whitelist-Freigabe forderst wird der Nachbar eine Sicherheitswarnung im Neuigkeitenreiter auslösen. Von dort kannst die die IP freigeben.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished">[Unbekannt]</translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Hinzugefügt mit Zertifikat von %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Zertifikat deines Freundes aus der Zwischenablage einfügen</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Fehler beim Laden des Zertifikats: Datei %1 konnte nicht gelesen werden</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Fehler beim Laden des Zertifikats: Mit %1 stimmt etwas nicht</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3563,7 +4155,7 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
     <message>
         <location line="-145"/>
         <source>Network </source>
-        <translation>Netzwerk </translation>
+        <translation>Netzwerk</translation>
     </message>
     <message>
         <location line="+152"/>
@@ -3603,7 +4195,7 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>UDP-Aufbau</translation>
     </message>
@@ -3615,7 +4207,7 @@ Das Zertifikat hat die falsche Versionsnummer. Beachte, dass v0.6- und v0.5-Netz
     <message>
         <location line="+132"/>
         <source>Status</source>
-        <translation>Status</translation>
+        <translation type="unfinished">Status</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -3631,7 +4223,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Verbindungsassistent</translation>
     </message>
@@ -3641,20 +4233,17 @@ p, li { white-space: pre-wrap; }
         <translation>Ungültige Peer-ID</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Unbekannter Zustand</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Hinter Symmetrischem NAT</translation>
     </message>
@@ -3664,14 +4253,12 @@ p, li { white-space: pre-wrap; }
         <translation>Hinter NAT &amp; kein DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Netzneustart</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>Hinter NAT</translation>
     </message>
@@ -3681,8 +4268,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kein DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>NETZZUSTAND GUT!</translation>
     </message>
@@ -3707,7 +4293,7 @@ p, li { white-space: pre-wrap; }
         <translation>RS-Nachbarn werden gesucht</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Suche erfordert DHT</translation>
     </message>
@@ -3755,12 +4341,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Initial connections can take a while, please be patient</source>
-        <translation>Erstverbindungen können etwas Zeit in Anspruch nehmen. Bitte gedulde dich</translation>
+        <translation>Erstverbindungen können etwas Zeit in Anspruch nehmen. Bitte gedulde dich.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>If an error is detected it will be displayed here</source>
-        <translation>Wenn ein Fehler festgestellt wird, wird er hier angezeigt</translation>
+        <translation>Wenn ein Fehler festgestellt wird, wird er hier angezeigt.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3812,7 +4398,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>DHT Lookup has taken too long</source>
-        <translation>DHT-Suche hat zu lange gedauert</translation>
+        <translation>DHT-Suche hat zu lange gedauert.</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -3822,7 +4408,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>UDP Connection has taken too long</source>
-        <translation>UDP-Verbindung hat zu lange gedauert</translation>
+        <translation>UDP-Verbindung hat zu lange gedauert.</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -3837,7 +4423,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>In this case the UDP connection attempt has failed.</source>
-        <translation>In diesem Fall ist der UDP-Verbindungsversuch fehlgeschlagen.</translation>
+        <translation>In diesem Fall ist der UDP-Verbindungsversuch fehlgeschlagen</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3941,7 +4527,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+4"/>
         <source>Please contact them to add your Full Certificate</source>
-        <translation>Bitte kontaktiere ihn/sie, damit sie dein vollständiges Zertifikat hinzufügen</translation>
+        <translation>Bitte kontaktiere ihn/sie, damit sie dein vollständiges Zertifikat hinzufügen.</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -3951,7 +4537,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>They are either offline or their DHT is Off</source>
-        <translation>Er/Sie ist entweder offline oder sein/ihr DHT ist aus</translation>
+        <translation>Er/Sie ist entweder offline oder sein/ihr DHT ist aus.</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -3966,7 +4552,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>You have previously connected to this Friend</source>
-        <translation>Du warst vorher bereits mit diesem Freund verbunden</translation>
+        <translation>Du warst vorher bereits mit diesem Freund verbunden.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3999,7 +4585,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bitte versuche noch einmal ein vollständiges Zertifikat zu importieren</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4007,8 +4593,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/V</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>NICHT VERIFIZIERBARE WEITERLEITUNG!</translation>
     </message>
@@ -4018,7 +4603,7 @@ p, li { white-space: pre-wrap; }
         <translation>NICHT VERIFIZIERBARE WEITERLEITUNG &amp; KEIN DHT</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Suchen</translation>
     </message>
@@ -4030,7 +4615,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+192"/>
         <source>Only Advanced Retroshare users should switch off the DHT.</source>
-        <translation>Nur fortgeschrittene RetroShare-Benutzer sollten DHT ausschalten.</translation>
+        <translation>Nur fortgeschrittene RetroShare-Benutzer sollten DHT ausschalten</translation>
     </message>
     <message>
         <location line="+76"/>
@@ -4040,7 +4625,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-45"/>
         <source>They need a Certificate + Node for UDP connections to succeed</source>
-        <translation>Für eine erfolgreiche UDP-Verbindung benötigen sie ein Zertifikat und einen Netzknoten</translation>
+        <translation>Für eine erfolgreiche UDP-Verbindung benötigen sie ein Zertifikat und einen Netzknoten.</translation>
     </message>
 </context>
 <context>
@@ -4054,19 +4639,19 @@ p, li { white-space: pre-wrap; }
         <translation>Kreisdetails</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Kreisname, der Kontaktautor und die Liste der eingeladenen Mitglieder sind für alle eingeladenen Mitglieder sichtbar. Wenn der Kreis nicht privat ist, ist er auch für Nachbarknoten der Knoten sichtbar, die die eingeladenen Mitglieder hosten.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The creator of a circle is purely optional. It is however useful for public circles so that people know with whom to discuss membership aspects.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Ersteller eines Kreises ist rein optional. Es ist jedoch für öffentliche Kreise nützlich, damit die Leute wissen, mit wem sie Mitgliedschaftsaspekte besprechen können.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+70"/>
@@ -4076,22 +4661,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+40"/>
         <source>Only &amp;visible to members of:</source>
-        <translation>Nur &amp; sichtbar für Mitglieder von:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>IDs</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>Profile</source>
-        <translation>Profil</translation>
+        <translation type="unfinished">Profil</translation>
     </message>
     <message>
         <location line="+46"/>
         <source>Signed by friend node</source>
-        <translation>Signiert von Freund Knoten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
@@ -4099,25 +4684,25 @@ p, li { white-space: pre-wrap; }
         <translation>Filter</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Eingeladene Mitglieder</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Members of this list will be automatically proposed to join the circle (by accepting membership). They will&lt;/p&gt;&lt;p&gt;not receive data that is restricted to this circle until they do so.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mitglieder dieser Liste werden automatisch für den Beitritt zum Kreis vorgeschlagen (durch Annahme der Mitgliedschaft). Sie erhalten&lt;/p&gt;&lt;p&gt;keine Daten, die auf diesen Kreis beschränkt sind, bis sie dies tun.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+81"/>
@@ -4125,7 +4710,15 @@ p, li { white-space: pre-wrap; }
         <translation>Bekannte Personen</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Typ</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
@@ -4147,12 +4740,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Publicly distributed circles are visible to your friends, which will get to know the circle data (Creator, members, etc)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Öffentlich verteilte Kreise sind für deine Freunde sichtbar, die dadurch die Daten des Kreises ( Ersteller, Mitglieder, etc)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Private (a.k.a. self-restricted) circles  are only visible to the invited members of these circles. In practice the circle uses its own list of invited members to limit its own distribution. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Private (auch bekannt als selbstbeschränkte) Kreise sind nur für die eingeladenen Mitglieder dieser Kreise sichtbar. In der Praxis verwendet der Kreis seine eigene Liste eingeladener Mitglieder, um seine eigene Verteilung einzuschränken. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4162,22 +4755,26 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+17"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Circles can be restricted to the members of another circle. Only the members of that second circle will be allowed to see the new circle and its content (list of members, etc).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kreise können auf die Mitglieder eines anderen Kreises beschränkt werden. Nur die Mitglieder dieses zweiten Kreises dürfen den neuen Kreis und seinen Inhalt (Liste der Mitglieder usw.) sehen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Nur sichtbar für Mitglieder von:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Bitte einen Namen für deinen Kreis vergeben.</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Kein Einschränkungskreis ausgewählt</translation>
     </message>
@@ -4187,26 +4784,12 @@ p, li { white-space: pre-wrap; }
         <translation>Keine Einschränkungen für Kreis gewählt</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation>Kreis erstellt</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation>Ihr neuer Kreis wurde erstellt:
-    Name: %1
-    ID: %2.</translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
-        <translation>[Unbekannt]</translation>
+        <translation type="unfinished">[Unbekannt]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
@@ -4216,7 +4799,7 @@ p, li { white-space: pre-wrap; }
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Suchen</translation>
@@ -4231,6 +4814,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Unterzeichnet</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Von bekannten Netzknoten unterzeichnet</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4240,13 +4827,17 @@ p, li { white-space: pre-wrap; }
         <location line="+145"/>
         <location line="+61"/>
         <source>[Anonymous Id]</source>
-        <translation>[Anonymous ID]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
         <source>PGP Identity</source>
         <translation>PGP-Identität</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Anonyme ID</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4269,13 +4860,17 @@ p, li { white-space: pre-wrap; }
         <translation>Neuen Kreis erstellen</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Erstellen</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP-verknüpfte ID</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Mitglied hinzufügen</translation>
     </message>
@@ -4294,7 +4889,7 @@ p, li { white-space: pre-wrap; }
         <translation>Gruppe erstellen</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Gruppenname:</translation>
     </message>
@@ -4311,7 +4906,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/groups/CreateGroup.cpp" line="-32"/>
         <source>To be defined</source>
-        <translation>Noch zu definieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4329,7 +4924,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Neuer Kanalbeitrag</translation>
     </message>
@@ -4339,44 +4934,44 @@ p, li { white-space: pre-wrap; }
         <translation>Kanalbeitrag</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
-        <translation>Posten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
         <location line="+89"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose aspect ratio policy. In &apos;Auto&apos; mode, the most suitable aspect ratio is chosen for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wählen Sie das Seitenverhältnis. Im Modus &quot;Auto&quot; wird das am besten geeignete Seitenverhältnis für Sie ausgewählt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Auto</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>1:1</source>
-        <translation>1:1</translation>
+        <translation type="unfinished">1:1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>3:4</source>
-        <translation>3:4</translation>
+        <translation type="unfinished">3:4</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>16:9</source>
-        <translation>16:9</translation>
+        <translation type="unfinished">16:9</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove Thumbnail&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Vorschaubild entfernen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+57"/>
@@ -4400,11 +4995,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Benutze Drag &amp; Drop / Datei hinzufügen Knopf, um Hashwert für neue Dateien zu erstellen.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; RetroShare-Links von deinen Freigaben kopieren/einfügen&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Datei hinzufügen</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Miniaturbild hinzufügen</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Nachricht</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Betreff:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4420,27 +5027,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-116"/>
         <source>Title</source>
-        <translation>Titel</translation>
+        <translation type="unfinished">Titel</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hide&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ausblenden&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add File&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Datei hinzufügen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Paste retroshare link(s) from clipboard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare-Link(s) aus der Zwischenablage einfügen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove File&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Datei entfernen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -4481,7 +5088,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+128"/>
         <source>Attachments (%1)</source>
-        <translation>Anhänge (%1)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+47"/>
@@ -4490,34 +5097,38 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
-        <translation>Diese Datei ist bereits in diesem Beitrag enthalten:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
-        <translation>Post bezieht sich auf nicht freigegebene Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This post contains files that you are currently not sharing. Do you still want to post?</source>
-        <translation>Dieser Beitrag enthält Dateien, die Sie derzeit nicht freigeben. Möchten Sie trotzdem posten?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Post refers to temporary shared files</source>
-        <translation>Beitrag bezieht sich auf temporäre freigegebene Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
-        <translation>Die folgenden Dateien werden nur für 30 Tage freigegeben. Denken Sie darüber nach, sie in ein freigegebenes Verzeichnis aufzunehmen.</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Datei wurde schon hinzugefügt und gehasht</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -4525,54 +5136,55 @@ p, li { white-space: pre-wrap; }
         <translation>Bitte einen Betreff hinzufügen</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation>Beitrag kann nicht veröffentlicht werden</translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Miniaturbild laden</translation>
     </message>
     <message>
         <location line="+119"/>
         <source>Show</source>
-        <translation>Zeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Hide</source>
-        <translation>Verbergen</translation>
+        <translation type="unfinished">Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Massendaten erzeugen</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Möchtest du wirklich %1 Nachrichten erzeugen?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Du bist dabei, Dateien hinzuzufügen, die du nicht freigegeben hast. Willst du das wirklich tun?</translation>
     </message>
     <message>
         <location line="-171"/>
         <source>Edit Channel Post</source>
-        <translation>Kanalbeitrag bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update</source>
-        <translation>Aktualisieren</translation>
+        <translation type="unfinished">Aktualisieren</translation>
     </message>
     <message>
         <location line="+110"/>
         <source>Close this window?</source>
-        <translation>Dieses Fenster schließen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Do you really want to discard your post?</source>
-        <translation>Wollen Sie Ihren Beitrag wirklich verwerfen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+65"/>
@@ -4584,7 +5196,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Forumsnachricht veröffentlichen</translation>
     </message>
@@ -4593,6 +5205,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Betreff</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4613,14 +5229,14 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation></translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+93"/>
         <source>Attach a Picture</source>
-        <translation>Bild anhängen</translation>
+        <translation type="unfinished">Bild anhängen</translation>
     </message>
     <message>
         <location line="+65"/>
@@ -4633,14 +5249,14 @@ p, li { white-space: pre-wrap; }
         <translation>Du kannst Dateien mit Drag&apos;n&apos;Drop anhängen</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
-        <translation>Posten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+0"/>
@@ -4650,42 +5266,42 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>Edit Message</source>
-        <translation>Nachricht bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Update</source>
-        <translation>Aktualisieren</translation>
+        <translation type="unfinished">Aktualisieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Text</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Kein Forum</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>Als Antwort auf</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
-        <translation>Titel</translation>
+        <translation type="unfinished">Titel</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation>Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -4707,14 +5323,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+41"/>
         <source>Cancel Forum Message</source>
-        <translation>Forum-Nachricht abbrechen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Forum Message has not been sent yet!
 Do you want to discard this message?</source>
-        <translation>Forum Nachricht wurde noch nicht gesendet!
-Möchten Sie diese Nachricht verwerfen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -4724,21 +5339,21 @@ Möchten Sie diese Nachricht verwerfen?</translation>
     <message>
         <location line="+9"/>
         <source>Load Picture File</source>
-        <translation>Bilddatei laden</translation>
+        <translation type="unfinished">Bilddatei laden</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>Keine kompatible Kennung für dieses Forum</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>None of your identities is allowed to post in this forum. This could be due to the forum being limited to a circle that contains none of your identities, or forum flags requiring a PGP-signed identity.</source>
-        <translation>Keine Ihrer Identitäten darf in diesem Forum schreiben. Dies könnte daran liegen, dass das Forum auf einen Kreis beschränkt ist, der keine Ihrer Identitäten enthält, oder dass Forum-Flags eine PGP-signierte Identität erfordern.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Massendaten erzeugen</translation>
     </message>
@@ -4747,6 +5362,10 @@ Möchten Sie diese Nachricht verwerfen?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Möchtest du wirklich %1 Nachrichten erzeugen?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Senden</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4761,9 +5380,25 @@ Möchten Sie diese Nachricht verwerfen?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Chatlobby erstellen</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Eine Chatlobby ist eine dezentralisierte und anonyme Chatgruppe. Alle Teilnehmer sehen alle Nachrichten. Wenn die Lobby erstellt wurde, kannst du Freunde über den &quot;Freunde&quot;-Reiter einladen.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Lobbyname:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Lobbythema:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
-        <translation>Ein Chatroom ist eine dezentralisierte und anonyme Chatgruppe. Alle Teilnehmer erhalten alle Nachrichten. Sobald der Raum erstellt ist, Siekönnen  andere Freundesknoten mit der Schaltfläche &quot;Einladen&quot; oben rechts einladen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -4796,17 +5431,17 @@ Möchten Sie diese Nachricht verwerfen?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
-        <translation>Erstellen</translation>
+        <translation type="unfinished">Erstellen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>erfordert PGP-signierte Identitäten</translation>
     </message>
@@ -4821,7 +5456,11 @@ Möchten Sie diese Nachricht verwerfen?</translation>
         <translation>Wähle die Freunde mit denen du chatten möchtest.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Freunde einladen</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Chatraum erstellen</translation>
@@ -4829,12 +5468,12 @@ Möchten Sie diese Nachricht verwerfen?</translation>
     <message>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+8"/>
         <source>Put a sensible chat room name here</source>
-        <translation>Geben Sie hier einen sinnvollen Chatroom-Namen ein</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Set a descriptive topic here</source>
-        <translation>Legen Sie hier ein beschreibendes Thema fest</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
@@ -4842,7 +5481,7 @@ Möchten Sie diese Nachricht verwerfen?</translation>
         <translation>Kontakte:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Zu verwendende Identität:</translation>
     </message>
@@ -4850,17 +5489,17 @@ Möchten Sie diese Nachricht verwerfen?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Öffentliche Information</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
@@ -4870,12 +5509,12 @@ Möchten Sie diese Nachricht verwerfen?</translation>
         <translation>Ort-ID:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Softwareversion:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Online seit:</translation>
     </message>
@@ -4887,7 +5526,7 @@ Möchten Sie diese Nachricht verwerfen?</translation>
     <message>
         <location line="+7"/>
         <source>Statistics:</source>
-        <translation>Statistiken:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+87"/>
@@ -4895,34 +5534,44 @@ Möchten Sie diese Nachricht verwerfen?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Show statistics</source>
-        <translation>Zeige Statistiken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Andere Informationen</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Profile path:</source>
-        <translation>Profilpfad:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
-        <translation>Profil</translation>
+        <translation type="unfinished">Profil</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Zertifikat</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Diese Option umfasst alle Signaturen Ihres Profilschlüssels. Unterschriften sind nicht zwingend erforderlich, sondern nur eine Möglichkeit, Ihr Vertrauen in ein bestimmtes Profil auszudrücken.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4930,19 +5579,23 @@ Möchten Sie diese Nachricht verwerfen?</translation>
         <translation>Signaturen einschließen</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Schlüssel in Datei sichern</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
-        <translation>Identität exportieren</translation>
+        <translation type="unfinished">Identität exportieren</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>RetroShare Identity files (*.asc)</source>
-        <translation>RetroShare-Identitätsdateien (*.asc)</translation>
+        <translation type="unfinished">RetroShare-Identitätsdateien (*.asc)</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Identity saved</source>
-        <translation>Identität gespeichert</translation>
+        <translation type="unfinished">Identität gespeichert</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -4951,7 +5604,7 @@ It is encrypted
 
 You can now copy it to another computer
 and use the import button to load it</source>
-        <translation>Deine Identität wurde erfolgreich gespeichert
+        <translation type="unfinished">Deine Identität wurde erfolgreich gespeichert
 Sie ist verschlüsselt
 
 Du kannst die Identität nun auf einen anderen Computer kopieren
@@ -4960,12 +5613,12 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source>Identity not saved</source>
-        <translation>Identität nicht gespeichert</translation>
+        <translation type="unfinished">Identität nicht gespeichert</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Your identity was not saved. An error occurred.</source>
-        <translation>Deine Identität wurde nicht gespeichert. Ein Fehler ist aufgetreten.</translation>
+        <translation type="unfinished">Deine Identität wurde nicht gespeichert. Ein Fehler ist aufgetreten.</translation>
     </message>
     <message>
         <location line="+92"/>
@@ -5004,50 +5657,50 @@ und den Import zum Laden verwenden</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
-        <translation>PGP-Fingerabdruck:</translation>
+        <translation>PGP-Fingerabdruck</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Netzknoteninformation</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP-ID :</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Freundknoten:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Short format</source>
-        <translation>Kurzformat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;IP history is the list of IP you used accross time. Including this might help your friends reach you. This is optional for privacy reasons.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der IP-Verlauf ist die Liste der IP-Adressen, die Sie im Laufe der Zeit verwendet haben. Wenn Sie dies hinzufügen, können Ihre Freunde Sie möglicherweise leichter erreichen. Dies ist aus Datenschutzgründen optional.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Include IP history</source>
-        <translation>IP-Verlauf einbeziehen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -5057,7 +5710,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saves your profile key pair into a file. This allows you to create a new node for the same profile, by importing this key pair on a different computer. Friends who already accept connections from you will automatically accept connections from that new node after you add them yourself. Your key is exported encrypted and you will need your login password to create a new profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Speichert Ihr Profilschlüsselpaar in einer Datei. Dadurch können Sie einen neuen Knoten für dasselbe Profil erstellen, indem Sie dieses Schlüsselpaar auf einem anderen Computer importieren. Freunde, die bereits Verbindungen von Ihnen akzeptieren, akzeptieren automatisch Verbindungen von diesem neuen Knoten, nachdem Sie sie selbst hinzugefügt haben. Ihr Schlüssel wird verschlüsselt exportiert und Sie benötigen Ihr Login-Passwort, um ein neues Profil zu erstellen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5069,6 +5722,14 @@ und den Import zum Laden verwenden</translation>
         <source>Node</source>
         <translation>Netzknoten</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Neuen Netzknoten erstellen...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">Statistikfenster anzeigen</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5114,13 +5775,13 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+14"/>
         <source>No peer found in DHT</source>
-        <translation>Kein Peer in DHT gefunden</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5142,7 +5803,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+156"/>
         <source>Faster</source>
-        <translation>Schneller</translation>
+        <translation type="unfinished">Schneller</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5152,7 +5813,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source>Slower</source>
-        <translation>Langsamer</translation>
+        <translation type="unfinished">Langsamer</translation>
     </message>
     <message>
         <location line="+64"/>
@@ -5394,7 +6055,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>Restarting</source>
-        <translation>Neustart</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5464,17 +6125,17 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>UPNP FORWARD</source>
-        <translation>UPNP WEITERLEITUNG</translation>
+        <translation>UPNP WEITERLEIT.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>NATPMP FORWARD</source>
-        <translation>NATPMP WEITERLEITUNG</translation>
+        <translation>NATPMP WEITERLEIT.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>MANUAL FORWARD</source>
-        <translation>MANUELLE WEITERLEITUNG</translation>
+        <translation>MANUELLE WEITERLEIT.</translation>
     </message>
     <message>
         <location line="+37"/>
@@ -5635,7 +6296,7 @@ und den Import zum Laden verwenden</translation>
         <location line="+9"/>
         <location line="+3"/>
         <source>%1 secs ago</source>
-        <translation>vor %1 Sekunden</translation>
+        <translation>vor %1 Sek.</translation>
     </message>
     <message>
         <location line="-92"/>
@@ -5645,7 +6306,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+14"/>
         <source>Relays</source>
-        <translation>Relais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+65"/>
@@ -5754,7 +6415,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+59"/>
         <source>Relay</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+58"/>
@@ -5788,7 +6449,7 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Datei ausführen</translation>
     </message>
@@ -5796,38 +6457,38 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>bis</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>Groß-/Kleinschreibung ignorieren</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>TT.MM.JJJJ</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KiB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MiB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GiB</translation>
     </message>
@@ -5835,12 +6496,12 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Ausdruck Oberfläche</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Diesen Ausdruck löschen</translation>
     </message>
@@ -5885,7 +6546,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+188"/>
         <source> Friend Help</source>
-        <translation> Freunde-Hilfe</translation>
+        <translation>Freunde-Hilfe</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6002,7 +6663,7 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Bild</translation>
     </message>
@@ -6012,7 +6673,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6072,21 +6733,11 @@ und den Import zum Laden verwenden</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Dateien von Freunden</translation>
     </message>
@@ -6098,7 +6749,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source># Files</source>
-        <translation># Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6128,12 +6779,12 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source>Column %1</source>
-        <translation>Spalte %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Row %1</source>
-        <translation>Zeile %1</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -6166,17 +6817,17 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>Load emoticons (costly)</source>
-        <translation>Emoticons laden (kostspielig)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Minimum font size</source>
-        <translation>Minimale Schriftgröße</translation>
+        <translation type="unfinished">Minimale Schriftgröße</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Minimum text contrast</source>
-        <translation>Minimaler Text-Kontrast</translation>
+        <translation type="unfinished">Minimaler Text-Kontrast</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -6191,7 +6842,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location filename="../gui/settings/ForumPage.h" line="+40"/>
         <source>Forums</source>
-        <translation>Foren</translation>
+        <translation type="unfinished">Foren</translation>
     </message>
 </context>
 <context>
@@ -6199,7 +6850,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location filename="../gui/common/FriendList.ui" line="+84"/>
         <source>Friends</source>
-        <translation>Freunde</translation>
+        <translation type="unfinished">Freunde</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -6208,9 +6859,9 @@ und den Import zum Laden verwenden</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
@@ -6225,7 +6876,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>export your friendlist including groups</source>
-        <translation>Exportieren Sie Ihre Freundesliste einschließlich Gruppen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -6235,7 +6886,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>import your friendlist including groups</source>
-        <translation>Importieren Sie Ihre Freundesliste einschließlich Gruppen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-30"/>
@@ -6250,7 +6901,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Gruppen anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
@@ -6286,7 +6937,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Zu Gruppe hinzufügen</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Suchen</translation>
@@ -6294,7 +6945,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+1"/>
         <source>Search ID</source>
-        <translation>Kennung suchen</translation>
+        <translation type="unfinished">Kennung suchen</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6302,7 +6953,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Nach Status sortieren</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Profildetails</translation>
     </message>
@@ -6383,8 +7034,7 @@ und den Import zum Laden verwenden</translation>
         <location line="+1"/>
         <source>
 (keep in mind that the file is unencrypted!)</source>
-        <translation type="unfinished">
-(Beachten Sie, dass die Datei unverschlüsselt ist!)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -6403,25 +7053,23 @@ und den Import zum Laden verwenden</translation>
         <location line="+2"/>
         <source>
 at least one peer was not added</source>
-        <translation>
-Mindestens ein Peer wurde nicht hinzugefügt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 at least one peer was not added to a group</source>
-        <translation>
-Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Select file for importing your friendlist from</source>
-        <translation>Wählen Sie die Datei aus, aus der Sie Ihre Freundesliste importieren möchten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Select a file for exporting your friendlist to</source>
-        <translation>Wählen Sie eine Datei aus, in die Sie Ihre Freundesliste exportieren möchten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-6"/>
@@ -6452,7 +7100,7 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+285"/>
         <source>Show Items</source>
-        <translation>Elemente anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/common/FriendList.ui" line="-38"/>
@@ -6525,12 +7173,12 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+34"/>
         <source>Please select at least one friend for recommendation.</source>
-        <translation>Bitte mindestens einen Freund als Empfehlung wählen.</translation>
+        <translation type="unfinished">Bitte mindestens einen Freund als Empfehlung wählen.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Please select at least one friend as recipient.</source>
-        <translation>Bitte mindestens einen Empfänger wählen.</translation>
+        <translation type="unfinished">Bitte mindestens einen Empfänger wählen.</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -6540,13 +7188,13 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+0"/>
         <source>A recommendation message was sent to each of the chosen friends!</source>
-        <translation>An jeden der ausgewählten Freunde wurde eine Empfehlungsnachricht gesendet!</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Freundschaftsanfrage bestätigen</translation>
     </message>
@@ -6563,6 +7211,10 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Suchen:</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6571,7 +7223,7 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location line="+4"/>
         <source>Filter only connected</source>
-        <translation>Nur verbundene Filtern</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -6584,7 +7236,7 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <translation>Freunde suchen</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Alle markieren</translation>
     </message>
@@ -6595,132 +7247,16 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <translation>Keine markieren</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Name</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished">Adresse</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Freund hinzufügen</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Statusnachricht bearbeiten</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Rundschreiben</translation>
     </message>
@@ -6803,38 +7339,33 @@ Also check your ports!</source>
         <translation>Schriftart auf den Standard setzen</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Schlüsselbund</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>RetroShare-Rundschreiben: Nachrichten werden an alle verbundenen Freunde gesendet.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation>Freundes-Server</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Netzwerkgraph</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Stelle hier deine Statusmeldung ein.</translation>
     </message>
@@ -6852,32 +7383,27 @@ Also check your ports!</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation>SAMv3-Unterstützung ist nicht verfügbar</translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation>I2P-Instanzadresse mit aktiviertem SAMv3</translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Alle Felder sind mit min. 3 Zeichen zu versehen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Passwords do not match</source>
-        <translation>Passwörter stimmen nicht überein</translation>
+        <translation>Passwörter stimmen nicht überein.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Das ist das Passwort für PGP</translation>
@@ -6898,109 +7424,112 @@ Also check your ports!</source>
         <translation>Das Erzeugen deines neuen Zertifikats ist fehlgeschlagen. Vielleicht ist das PGP-Passwort falsch?</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
-        <translation>PGP-Schlüssellänge</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Geben Sie hier ein sicheres Passwort ein. Dieses Passwort schützt Ihren privaten Knotenschlüssel!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bitte bewegen Sie Ihre Maus, um so viel Zufälligkeit wie möglich zu sammeln. Zum Erstellen Ihrer Knotenschlüssel sind mindestens 20 % erforderlich.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Standardknoten</translation>
     </message>
     <message>
-        <location line="+196"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ihr Knotenname bezeichnet die Retroshare-Instanz, die&lt;/p&gt;&lt;p&gt;auf diesem Computer ausgeführt wird.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">TOR/I2P Versteckter Knoten</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location line="+184"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Knotenname</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
-        <translation>Knotentyp:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Hidden node (over Tor)</source>
-        <translation>Hidden Knoten (über Tor)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hidden node (Tor/I2P - Manually configured)</source>
-        <translation>Hidden Knoten (Tor/I2P – manuell konfiguriert)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>advanced options</source>
-        <translation>erweiterte Optionen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Der Profilname identifiziert Sie über das Netzwerk.&lt;/p&gt;&lt;p&gt;Er wird von Ihren Freunden verwendet, um Verbindungen von Ihnen anzunehmen.&lt;/p&gt;&lt;p&gt;Das können Sie Erstellen Sie mehrere Retroshare-Knoten mit demselben Profil auf verschiedenen Computern.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Dieses Profil exportieren</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Use existing profile...</source>
-        <translation>Vorhandenes Profil verwenden...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation>I2P verwenden</translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identitäten werden verwendet, wenn Sie in Chatrooms, Foren und Kanalkommentaren schreiben. &lt;/p&gt;&lt;p&gt;Sie empfangen/senden auch E-Mails über das Retroshare-Netzwerk. Sie können&lt;/p&gt;&lt;p&gt;eine signierte Identität jetzt erstellen oder dies später tun, wenn Sie sie benötigen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>Los!</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Erweiterte Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>versteckte Adresse</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Dein Profil ist mit einem PGP-Schlüsselpaar verknüpft. RetroShare ignoriert derzeit DSA-Schlüssel.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dies ist dein Verbindungsport.&lt;/p&gt;&lt;p&gt;Ein Wert zwischen 1024 und 65535 &lt;/p&gt;&lt;p&gt;sollte ok sein. Du kannst ihn später ändern.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7048,30 +7577,30 @@ und den Import zum Laden verwenden</translation>
         <translation>Dein Profil wurde nicht gespeichert. Ein Fehler ist aufgetreten.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Profil importieren</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
-        <translation>Neues Profil und neuen Retroshare-Knoten erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Create new Retroshare node</source>
-        <translation>Neuen Retroshare-Knoten erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
-        <translation>Tor/I2P-Adresse</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -7081,7 +7610,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+2"/>
         <source>Password again</source>
-        <translation>Passwort wiederholen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+107"/>
@@ -7099,7 +7628,7 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7109,7 +7638,12 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7119,7 +7653,12 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7131,7 +7670,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+10"/>
         <source>RetroShare profile files (*.asc);;All files (*)</source>
-        <translation>RetroShare-Profildateien (*.asc);;Alle Dateien (*)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
@@ -7156,22 +7695,22 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+31"/>
         <source>The GXS nickname is too short. Please input at least %1 characters.</source>
-        <translation>Der GXS-Spitzname ist zu kurz. Bitte geben Sie mindestens %1 Zeichen ein.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>The GXS nickname is too long. Please reduce the length to %1 characters.</source>
-        <translation>Der GXS-Spitzname ist zu lang. Bitte reduzieren Sie die Länge auf %1 Zeichen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Tor is not available</source>
-        <translation>Tor ist nicht verfügbar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>No Tor executable has been found on your system. You need to install Tor before creating a hidden identity.</source>
-        <translation>Es wurde keine ausführbare Tor-Datei auf deinem System gefunden. Du musst Tor installieren, bevor du eine hidden Identität erstellen kannst.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
@@ -7252,22 +7791,22 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+12"/>
         <source>When checked, this instance receives new parameters (like RsLink or RsFile) and avoid new one.</source>
-        <translation>Wenn diese Instanz geprüft wird, erhält sie neue Parameter (wie RsLink oder RsFile) und vermeidet neue Parameter.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use Local Server to get new arguments.</source>
-        <translation>Verwenden Sie Local Server, um neue Argumente zu erhalten.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Install RetroShare with a package installer to get&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Installieren Sie RetroShare mit einem Paket-Installer, um&lt;/p&gt;&lt;p&gt;/usr/share/applications/retroshare.desktop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>!!!The RetroShare&apos;s desktop file is missing or wrong!!!</source>
-        <translation>!!!Die Desktop-Datei von RetroShare fehlt oder ist falsch!!!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -7282,32 +7821,32 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+7"/>
         <source> seconds</source>
-        <translation> Sekunden</translation>
+        <translation>Sekunden</translation>
     </message>
     <message>
         <location filename="../gui/settings/GeneralPage.cpp" line="+60"/>
         <source>You have sufficient rights.</source>
-        <translation>Sie haben genügend Rechte.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>You don&apos;t have sufficient rights. Run RetroShare as Admin to change this setting.</source>
-        <translation>Sie haben nicht genügend Rechte. Führen Sie RetroShare als Administrator aus, um diese Einstellung zu ändern.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>For security reasons the usage of auto-login is discouraged, you can enable it but you are on your own!</source>
-        <translation>Aus Sicherheitsgründen wird von der Verwendung der automatischen Anmeldung abgeraten, Sie können sie zwar aktivieren, sind aber auf sich allein gestellt!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your RetroShare build has auto-login disabled.</source>
-        <translation>In Ihrem RetroShare-Programm ist die automatische Anmeldung deaktiviert.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>No Qt-compatible system tray was found on this system.</source>
-        <translation>Auf diesem System wurde kein Qt-kompatibler Systemtray gefunden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+63"/>
@@ -7345,13 +7884,36 @@ und den Import zum Laden verwenden</translation>
         <translation>Erste Schritte</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Freunde einladen</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;RetroShare ist nichts ohne deine Freunde. Klicke auf &amp;quot;Freunde einladen&amp;quot; um den Prozess zu starten.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Schicke eine Einladungsmail mit deinem &amp;quot;Zertifikat&amp;quot; an deine Freunde.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Versichere dich ihre Einladung zurück zu bekommen... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Du kannst dich nur zu deinen Freunden verbinden, wenn ihr euch gegenseitig hinzugefügt habt.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Füge deine Freunde zu RetroShare hinzu</translation>
     </message>
@@ -7361,103 +7923,89 @@ und den Import zum Laden verwenden</translation>
         <translation>Freunde hinzufügen</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Zu Freunden verbinden</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Erweitert: Öffne Firewall Port</translation>
-    </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Zu Freunden verbinden</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Erweitert: Öffne Firewall Port</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Weitere Hilfe und Support</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>RS-Website öffnen</translation>
     </message>
@@ -7482,7 +8030,7 @@ p, li { white-space: pre-wrap; }
         <translation>E-Mail-Feedback</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare-Einladung</translation>
     </message>
@@ -7532,12 +8080,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare Feedback</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>RetroShare Support</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Es hat viele Funktionen wie Chat, Nachrichten,</translation>
     </message>
@@ -7587,12 +8135,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+10"/>
         <source>Receive time</source>
-        <translation>Empfangszeit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Sending time</source>
-        <translation>Sendezeit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -7607,12 +8155,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-25"/>
         <source>Data hash</source>
-        <translation>Datenhash</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Branching factor</source>
-        <translation>Verzweigungsfaktor</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/statistics/GlobalRouterStatistics.cpp" line="+132"/>
@@ -7661,7 +8209,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Gruppenchat anzeigen</translation>
     </message>
@@ -7669,7 +8217,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[Unbekannt]</translation>
     </message>
@@ -7707,72 +8255,72 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/common/GroupFlagsWidget.cpp" line="+121"/>
         <source>Directory content is visible to friend nodes (see list at right)</source>
-        <translation>Der Inhalt des Verzeichnisses ist für Freundesknoten sichtbar (siehe Liste rechts)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Directory content is NOT visible to friend nodes</source>
-        <translation>Der Verzeichnisinhalt ist für Freundesknoten NICHT sichtbar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Directory can be searched anonymously</source>
-        <translation>Das Verzeichnis kann anonym durchsucht werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Directory cannot be searched anonymously</source>
-        <translation>Das Verzeichnis kann nicht anonym durchsucht werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Files can be accessed using anonymous tunnels</source>
-        <translation>Auf Dateien kann über anonyme Tunnel zugegriffen werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Files can be accessed using anonymous &amp; end-to-end encrypted tunnels</source>
-        <translation>Auf Dateien kann über anonyme und Ende-zu-Ende-verschlüsselte Tunnel zugegriffen werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Files cannot be downloaded anonymously</source>
-        <translation>Dateien können nicht anonym heruntergeladen werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
         <source>All friend nodes can see this directory</source>
-        <translation>Alle Freundesknoten können dieses Verzeichnis sehen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Only visible to friend nodes in groups: %1</source>
-        <translation>Nur für Freundesknoten in Gruppen sichtbar: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Not visible to friend nodes</source>
-        <translation>Für Freundesknoten nicht sichtbar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Files can be downloaded (but not searched) anonymously</source>
-        <translation>Dateien können anonym heruntergeladen (aber nicht durchsucht) werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Files can be downloaded and searched anonymously</source>
-        <translation>Dateien können anonym heruntergeladen und durchsucht werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Files can be searched (but not downloaded) anonymously</source>
-        <translation>Dateien können anonym durchsucht (aber nicht heruntergeladen) werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>No one can anonymously access/search these files.</source>
-        <translation>Niemand kann anonym auf diese Dateien zugreifen bzw. diese durchsuchen.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -7803,22 +8351,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+34"/>
         <source>Share channel publish permissions</source>
-        <translation>Teilen Sie die Veröffentlichungsberechtigung für dieses Kanal</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can allow your friends to publish in your channel, or send the publish permissions to another Retroshare instance of yours. Select the friends which you want to be allowed to publish in this channel. Note: it is currently not possible to revoke channel publish permissions.</source>
-        <translation>Sie können Ihren Freunden erlauben, in Ihrem Kanal zu veröffentlichen, oder die Veröffentlichungsberechtigung an eine andere Retroshare-Instanz von Ihnen senden. Wählen Sie die Freunde aus, denen Sie erlauben wollen, in diesem Kanal zu veröffentlichen. Hinweis: Es ist derzeit nicht möglich, die Veröffentlichungsberechtigung für den Kanal zu widerrufen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Share board admin permissions</source>
-        <translation>Teilen Sie die Veröffentlichungsberechtigung für dieses Board</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You can allow your friends to edit the board. Select them in the list below. Note: it is not possible to revoke Board admin permissions.</source>
-        <translation>Sie können Ihren Freunden erlauben, das Board zu bearbeiten. Wählen Sie sie in der Liste unten aus. Hinweis: Es ist nicht möglich, die Administratorrechte für das Board zu entziehen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+18"/>
@@ -7835,11 +8383,19 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Du kannst deine Freunde von deinem Forum wissen lassen, indem du es mit ihnen teilst. Wähle die Freunde, mit denen du das Forum teilen willst.</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">Thema-Administratorrechte teilen</translation>
+    </message>
+    <message>
+        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
+        <translation type="vanished">Du kannst deinen Freunden die Bearbeitung des Themas erlauben, indem du sie in der Liste unten auswählst. Hinweis: Der Widerruf von Posted-Administratorrechten ist nicht möglich.</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
@@ -7852,12 +8408,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7879,51 +8435,67 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Search entire network...</source>
-        <translation>Suche im gesamten Netzwerk...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort by Name</source>
+        <translation type="vanished">Nach Name sortieren</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Nach Beliebtheit sortieren</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Nach letztem Beitrag sortieren</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
-        <translation>Sie sind Administrator (ändern Sie Namen und Beschreibung über das Menü Bearbeiten)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You have been granted as publisher (you can post here!)</source>
-        <translation>Sie wurden als Publisher zugelassen (Sie können hier posten!)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Id</source>
-        <translation>ID</translation>
+        <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Letzter Beitrag</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Popularity</source>
-        <translation>Beliebtheit</translation>
+        <translation type="unfinished">Beliebtheit</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sucht ein einzelnes Schlüsselwort im erreichbaren Netz.&lt;/p&gt;&lt;p&gt;Objekte, die bereits von befreundeten Knoten bereitgestellt wurden, werden nicht gemeldet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/common/GroupTreeWidget.cpp" line="+4"/>
@@ -7934,7 +8506,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>und</translation>
     </message>
@@ -8034,43 +8606,43 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="+418"/>
         <source>Authenticated tunnels:</source>
-        <translation>Authentifizierte Tunnel:</translation>
+        <translation type="unfinished">Authentifizierte Tunnel:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Tunnel ID: %1</source>
-        <translation>Tunnelkennung: %1</translation>
+        <translation type="unfinished">Tunnelkennung: %1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>from: %1 (%2)</source>
-        <translation>von: %1 (%2)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>to: %1 (%2)</source>
-        <translation>an: %1 (%2)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>status: %1</source>
-        <translation>Status: %1</translation>
+        <translation type="unfinished">Status: %1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>total sent: %1 bytes</source>
-        <translation>Gesendet gesamt: %1 bytes</translation>
+        <translation type="unfinished">Gesendet gesamt: %1 bytes</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>total recv: %1 bytes</source>
-        <translation>Empfangen gesamt: %1 bytes</translation>
+        <translation type="unfinished">Empfangen gesamt: %1 bytes</translation>
     </message>
 </context>
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanäle</translation>
@@ -8081,22 +8653,22 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal erstellen</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Auto-Download aktivieren</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Eigene Kanäle</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Abonnierte Kanäle</translation>
     </message>
@@ -8116,12 +8688,12 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal-Download-Verzeichnis auswählen</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Auto-Download deaktivieren</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>Herunterladeverzeichnis festlegen</translation>
     </message>
@@ -8156,22 +8728,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
-        <translation>Abspielen</translation>
+        <translation type="unfinished">Abspielen</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Ordner öffnen</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
-        <translation>Datei öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
@@ -8191,30 +8763,57 @@ p, li { white-space: pre-wrap; }
         <translation>Überprüfe</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Möchtest du wirklich abbrechen und die Datei löschen?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Kann Ordnder nicht öffnen</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
-        <translation>Datei abspielen</translation>
+        <translation type="unfinished">Datei abspielen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File %1 does not exist at location.</source>
-        <translation>Datei %1 existiert nicht.</translation>
+        <translation type="unfinished">Datei %1 existiert nicht.</translation>
+    </message>
+</context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formular</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Dateiname</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Größe</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Titel</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Veröffentlicht</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Status</translation>
     </message>
 </context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Neuen Kanal erstellen</translation>
     </message>
@@ -8252,33 +8851,23 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation>Letzte Aktivität</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation>Diesen Kanal abonnieren</translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Kanal abonnieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Subscribe</source>
-        <translation>Abonnieren</translation>
+        <translation type="unfinished">Abonnieren</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -8293,24 +8882,23 @@ p, li { white-space: pre-wrap; }
         <translation>Kanalbeschreibung</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Lade</translation>
     </message>
     <message>
         <location line="+97"/>
         <source>Publish permission received for channel: </source>
-        <translation>Veröffentlichungserlaubnis für Kanal erhalten: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>New Channel: </source>
-        <translation>Neuer Kanal: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation>Nie</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Neuer Kanal</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8321,7 +8909,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Neuer Kommentar:</translation>
     </message>
@@ -8342,7 +8930,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
@@ -8398,24 +8986,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Dateien</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Warnung! Du hast weniger als %1 Stunden und %2 Minuten bevor die Datei gelöscht wird. Denke daran, sie zu speichern.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
@@ -8430,19 +9022,23 @@ p, li { white-space: pre-wrap; }
         <translation>Das gefällt mir nicht</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Lade</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
-        <translation type="unfinished">Lade...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
-        <translation type="unfinished">Kommentare </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
-        <translation type="unfinished">Posten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+112"/>
@@ -8465,39 +9061,154 @@ p, li { white-space: pre-wrap; }
         <translation>Medium abspielen</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">In Kanal veröffentlichen</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Lade</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Kanäle durchsuchen</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Titel</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Titel durchsuchen</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Nachricht</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Nachricht suchen</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Dateiname</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Dateiname suchen</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Keinen Kanal gewählt</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Nie</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Öffentlich</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle &quot;</source>
+        <translation type="vanished">Beschränkt auf Mitglieder des Kreises &quot;</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle </source>
+        <translation type="vanished">Beschränkt auf Mitglieder des Kreises </translation>
+    </message>
+    <message>
+        <source>Your eyes only</source>
+        <translation type="vanished">Nur Ihre Augen</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Auto-Download deaktivieren</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Auto-Download aktivieren</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Zeige Feeds</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Zeige Dateien</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Administrator:</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Letzter Beitrag:</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">unbekannt</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Verteilung:</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Feeds</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Dateien</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Abonnenten</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beschreibung:</translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">Beiträge (bei Nachbarknoten)</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
-        <translation>In Kanal veröffentlichen</translation>
+        <translation type="unfinished">In Kanal veröffentlichen</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
-        <translation>Beitrag erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
         <location line="+10"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Search channels</source>
-        <translation>Kanäle durchsuchen</translation>
+        <translation type="unfinished">Kanäle durchsuchen</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Channel details</source>
-        <translation>Kanal-Details</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Channel title</source>
-        <translation>Kanal-Titel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
@@ -8505,18 +9216,18 @@ p, li { white-space: pre-wrap; }
         <location line="+16"/>
         <location line="+42"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
         <location line="-302"/>
         <source>Distribution:</source>
-        <translation>Verteilung:</translation>
+        <translation type="unfinished">Verteilung:</translation>
     </message>
     <message>
         <location line="+7"/>
         <location line="+84"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Includes all posts, comments and votes. This number is progressively updated when new friend connect. The local vs. at friends difference may indicate that you would get older posts by increasing the synchronization period.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enthält alle Beiträge, Kommentare und Abstimmungen. Diese Zahl</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-74"/>
@@ -8524,307 +9235,296 @@ p, li { white-space: pre-wrap; }
         <location line="+64"/>
         <location line="+33"/>
         <source>unknown</source>
-        <translation>unbekannt</translation>
+        <translation type="unfinished">unbekannt</translation>
     </message>
     <message>
         <location line="-107"/>
         <location line="+29"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This includes posts, comments to posts and votes to comments.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dies umfasst Beiträge, Kommentare zu Beiträgen und Stimmen zu Kommentaren.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Last activity:</source>
-        <translation>Letzte Aktivität:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Administrator:</source>
-        <translation>Administrator:</translation>
+        <translation type="unfinished">Administrator:</translation>
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
-        <translation>Artikel (vor Ort / bei Freunden):</translation>
+        <source>Posts (locally / at friends):</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Created:</source>
-        <translation>Erstellt:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Sync period:</source>
-        <translation>Sync-Zeitraum:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+52"/>
         <source>Posts</source>
-        <translation>Beiträge</translation>
+        <translation type="unfinished">Beiträge</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click to view post. &lt;/p&gt;&lt;p&gt;Use Ctrl+mouse wheel &lt;/p&gt;&lt;p&gt;to zoom/unzoom.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Klicken Sie, um den Beitrag zu sehen. &lt;/p&gt;&lt;p&gt;Verwenden Sie Strg+Mausrad&lt;/p&gt;&lt;p&gt;zum Zoomen/Entzoomen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Details</source>
-        <translation>Details</translation>
+        <translation type="unfinished">Details</translation>
     </message>
     <message>
         <location line="+83"/>
         <location line="+87"/>
         <source>Files</source>
-        <translation>Dateien</translation>
+        <translation type="unfinished">Dateien</translation>
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
-        <translation>Kommentare</translation>
+        <translation type="unfinished">Kommentare</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>All files</source>
-        <translation>Alle Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Feeds</source>
-        <translation>Feeds</translation>
+        <translation type="unfinished">Feeds</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
-        <translation>Klicken Sie, um zur Listenansicht zu wechseln</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
-        <translation>Nur ungelesene Beiträge anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
         <source>No files in this post, or no post selected</source>
-        <translation>Keine Dateien in diesem Beitrag, oder kein Beitrag ausgewählt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>No files in the channel, or no channel selected</source>
-        <translation>Keine Dateien im Kanal, oder kein Kanal ausgewählt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
-        <translation>Kein Text zum Anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Search...</source>
-        <translation>Suchen...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>No posts available in this channel</source>
-        <translation>Keine Beiträge in diesem Kanal vorhanden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
-        <translation>Zur Listenansicht wechseln</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Switch to grid view</source>
-        <translation>Zur Gitteransicht wechseln</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Download files</source>
-        <translation>Dateien herunterladen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Mark as unread</source>
-        <translation>Als ungelesen markieren</translation>
+        <translation type="unfinished">Als ungelesen markieren</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Edit</source>
-        <translation>Bearbeiten</translation>
+        <translation type="unfinished">Bearbeiten</translation>
     </message>
     <message>
         <location line="+38"/>
         <source>Click to switch to grid view</source>
-        <translation>Klicken, um zur Rasteransicht zu wechseln</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Link creation error</source>
-        <translation>Fehler bei der Link-Erstellung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Link could not be created: </source>
-        <translation>Link konnte nicht erstellt werden: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Download this file:</source>
-        <translation>Diese Datei herunterladen:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Download All these %1 files:</source>
-        <translation>Alle diese %1-Dateien herunterladen:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Totaling: %1</source>
-        <translation>Gesamtwert: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
-        <translation>Kommentare (%1)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation>Lade...</translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation>Keine Beiträge in diesem Kanal vorhanden.</translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
-        <translation>[Kein Name]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Never</source>
-        <translation>Nie</translation>
+        <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>5 days</source>
-        <translation>5 Tage</translation>
+        <translation type="unfinished">5 Tage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>2 weeks</source>
-        <translation>2 Wochen</translation>
+        <translation type="unfinished">2 Wochen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1 month</source>
-        <translation>1 Monat</translation>
+        <translation type="unfinished">1 Monat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3 months</source>
-        <translation>3 Monate</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>6 months</source>
-        <translation>6 Monate</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1 year</source>
-        <translation>1 Jahr</translation>
+        <translation type="unfinished">1 Jahr</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>indefinitly</source>
-        <translation>Unbegrenzt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Unknown</source>
-        <translation>Unbekannt</translation>
+        <translation type="unfinished">Unbekannt</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Public</source>
-        <translation>Öffentlich</translation>
+        <translation type="unfinished">Öffentlich</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation>Beschränkt auf Mitglieder des Kreises &quot;</translation>
+        <translation type="unfinished">Beschränkt auf Mitglieder des Kreises &quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation>Beschränkt auf Mitglieder des Kreises </translation>
+        <translation type="unfinished">Beschränkt auf Mitglieder des Kreises </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your eyes only</source>
-        <translation>Nurfür Ihre Augen</translation>
+        <translation type="unfinished">Nur Ihre Augen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You and your friend nodes</source>
-        <translation>Du und deine Freundschaftsknoten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
-        <translation>Abonniert</translation>
+        <translation type="unfinished">Abonniert</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Subscribe</source>
-        <translation>Abonnieren</translation>
+        <translation type="unfinished">Abonnieren</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Channel info missing</source>
-        <translation>Kanalinformationen fehlen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>To subscribe, first request the channel information by right-clicking Request Data in the search results.</source>
-        <translation>Um sich zu abonnieren, fordern Sie zunächst die Kanalinformationen an, indem Sie in den Suchergebnissen mit der rechten Maustaste auf Daten anfordern klicken.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Channel info requested...</source>
-        <translation>Kanalinformationen angefordert...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
         <source>No Channel Selected</source>
-        <translation>Kein Kanal ausgewählt</translation>
+        <translation type="unfinished">Keinen Kanal gewählt</translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Disable Auto-Download</source>
-        <translation>Auto-Download deaktivieren</translation>
+        <translation type="unfinished">Auto-Download deaktivieren</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Enable Auto-Download</source>
-        <translation>Auto-Download aktivieren</translation>
+        <translation type="unfinished">Auto-Download aktivieren</translation>
     </message>
 </context>
 <context>
@@ -8838,132 +9538,132 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
-        <translation>Kreisname:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
-        <translation>Akzeptieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Revoke</source>
-        <translation>Widerrufen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Details</source>
-        <translation>Details</translation>
+        <translation type="unfinished">Details</translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Remove Item</source>
-        <translation>Eintrag entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
-        <translation>Mitgliedschaftsantrag gewähren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
         <source>Revoke membership</source>
-        <translation>Mitgliedschaft widerrufen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-39"/>
         <source>You received a membership request a circle you&apos;re administrating:</source>
-        <translation>Sie haben einen Antrag auf Mitgliedschaft in einem von Ihnen verwalteten Kreis erhalten:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Grant membership</source>
-        <translation>Mitgliedschaft gewähren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Grant membership to this circle, for this identity</source>
-        <translation>Gewährung der Mitgliedschaft in diesem Kreis, für diese Identität</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>You received an invitation to join this circle:</source>
-        <translation>Sie haben eine Einladung erhalten, diesem Kreis beizutreten:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Accept invitation</source>
-        <translation>Einladung annehmen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source> has left this circle.</source>
-        <translation> hat diesen Kreis verlassen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source> which you invited, has joined this circle you&apos;re administrating.</source>
-        <translation> die Sie eingeladen haben, ist zu diesem Kreis beigetreten, den Sie verwalten.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Revoke membership for that identity</source>
-        <translation>Entzug der Mitgliedschaft für diese Identität</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source> has joined this circle.</source>
-        <translation> ist diesem Kreis beigetreten.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Your identity %1 has been revoked from this circle.</source>
-        <translation>Ihre Identität %1 wurde aus diesem Kreis entfernt.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Cancel membership request</source>
-        <translation>Mitgliedsantrag stornieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel your membership request from that circle</source>
-        <translation>Ihren Mitgliedschaftsantrag aus diesem Kreis stornieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Your identity %1 as been accepted in this circle.</source>
-        <translation>Ihre Identität %1 wurde in diesem Kreis akzeptiert.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Cancel membership</source>
-        <translation>Mitgliedschaft kündigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel your membership from that circle</source>
-        <translation>Ihre Mitgliedschaft in diesem Kreis kündigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Received event from unknown Circle:</source>
-        <translation>Ereignis von unbekanntem Kreis erhalten:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Kommentarcontainer</translation>
     </message>
@@ -8976,14 +9676,14 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sortieren nach&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Hot</source>
-        <translation>Hot</translation>
+        <translation>Heiß</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -8998,7 +9698,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+25"/>
         <source>Voter ID:</source>
-        <translation>Wähler-ID:</translation>
+        <translation>Wähler-ID</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -9006,7 +9706,7 @@ p, li { white-space: pre-wrap; }
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
@@ -9045,7 +9745,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Auf Kommentar antworten</translation>
     </message>
@@ -9057,7 +9757,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Copy Comment</source>
-        <translation>Kommentar kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -9069,21 +9769,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Dagegen stimmen</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation>Autor anzeigen</translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation>Kann nicht abstimmen</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation>Fehler bei der Abstimmung: </translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9093,57 +9778,69 @@ p, li { white-space: pre-wrap; }
         <translation>Kommentieren</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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:12pt; font-weight:600;&quot;&gt;Compose new Comment&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;
-&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:12pt; font-weight:600;&quot;&gt;Neuen Kommentar verfassen&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+80"/>
         <source>Type in your comment</source>
-        <translation>Geben Sie Ihren Kommentar ein</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Post as:</source>
-        <translation>Posten als:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
-        <translation>Posten</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Kommentar&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Unterzeichnet von</translation>
     </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
-        <translation>Auf Kommentar antworten</translation>
+        <translation type="unfinished">Auf Kommentar antworten</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Replying to</source>
-        <translation>Antwort auf</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Type your reply</source>
-        <translation>Geben Sie Ihre Antwort ein</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+41"/>
@@ -9155,17 +9852,17 @@ p, li { white-space: pre-wrap; }
         <source>You need to create an Identity
 before you can comment</source>
         <translation>Du musst eine Identität erstellen,
-bevor du kommentieren kannst</translation>
+bevor du kommentieren kannst.</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation>Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -9173,7 +9870,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location filename="../gui/gxsforums/GxsForumGroupDialog.cpp" line="+66"/>
         <source>&lt;p&gt;Put one of your identities here to allow others to send feedback and also have moderator rights on the forum. You may as well leave that field blank and keep the forum anonymously administrated.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Geben Sie hier eine Ihrer Identitäten ein, damit andere Feedback senden können und auch über Moderatorrechte im Forum verfügen. Sie können dieses Feld auch leer lassen und das Forum anonym verwalten.&lt;/p&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
@@ -9198,7 +9895,15 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+4"/>
         <source>Forum moderators can edit/delete/pinup others posts</source>
-        <translation>Forummoderatoren können Beiträge bearbeiten, löschen oder anheften</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Forum-Administratoren hinzufügen</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Forum-Administratoren auswählen</translation>
     </message>
     <message>
         <location line="-11"/>
@@ -9209,23 +9914,23 @@ bevor du kommentieren kannst</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Forum abonnieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Subscribe</source>
-        <translation>Abonnieren</translation>
+        <translation type="unfinished">Abonnieren</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Copy RetroShare link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -9242,27 +9947,26 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+36"/>
         <source>Moderator list</source>
-        <translation>Moderatorenliste</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <source>Loading</source>
+        <translation type="vanished">Lade</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
-        <translation>Lade...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+103"/>
         <source>Moderator list changed</source>
-        <translation>Moderatorenliste geändert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Forum updated</source>
-        <translation>Forum aktualisiert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -9278,24 +9982,24 @@ bevor du kommentieren kannst</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
-        <translation>Betreff: </translation>
+        <translation>Betreff:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Forum abbestellen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unsubscribe</source>
-        <translation>Abbestellen</translation>
+        <translation type="unfinished">Abbestellen</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -9312,20 +10016,24 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+68"/>
         <source>In Reply to: </source>
-        <translation>Als Antwort auf: </translation>
+        <translation>Als Antwort auf:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Lade</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
-        <translation>Lade...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Forumfeed</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
@@ -9338,66 +10046,63 @@ bevor du kommentieren kannst</translation>
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Ein neues Thema im ausgewählten Forum starten</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Foren durchsuchen</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Letzter Beitrag</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
-        <translation>Neues Thema</translation>
+        <translation type="unfinished">Neues Thema</translation>
+    </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Hierarchische Ansicht</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Ebene Ansicht</translation>
     </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Bild speichern</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Lade</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9407,7 +10112,12 @@ bevor du kommentieren kannst</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Auf Nachricht antworten</translation>
     </message>
@@ -9424,13 +10134,17 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+23"/>
         <source>Next unread message</source>
-        <translation>Nächste ungelesene Nachricht</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Download all files</source>
         <translation>Alle Dateien herunterladen</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Nächste ungelesene</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9447,25 +10161,33 @@ bevor du kommentieren kannst</translation>
         <translation>Autor durchsuchen</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Inhalt</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Inhalt durchsuchen</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Kein Name</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
-        <translation>Lade...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+150"/>
@@ -9506,12 +10228,20 @@ bevor du kommentieren kannst</translation>
         <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Erweitern</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Gebannt]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[unbekannt]</translation>
     </message>
@@ -9533,7 +10263,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+5"/>
         <source>Only friends nodes in group </source>
-        <translation>Nur Freundesknoten in der Gruppe </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
@@ -9541,21 +10271,41 @@ bevor du kommentieren kannst</translation>
         <translation>Nur Ihre Augen</translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation>Verteilung</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Owner</source>
-        <translation>Eigentümer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Anti-spam</source>
         <translation>Anti-Spam</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Redigierte Nachricht ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anonym</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">unterzeichnet</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">keine</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Fehlende Nachricht ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9625,14 +10375,14 @@ bevor du kommentieren kannst</translation>
         <translation>Ursprüngliche Nachricht</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
-        <translation>Bearbeiten</translation>
+        <translation type="unfinished">Bearbeiten</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -9663,7 +10413,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="-6"/>
         <source>Give neutral opinion</source>
-        <translation type="unfinished">Neutrale Meinung abgeben</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -9683,7 +10433,7 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+19"/>
         <source>Show author in people tab</source>
-        <translation type="unfinished">Autor auf der Registerkarte Personen anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+99"/>
@@ -9691,9 +10441,9 @@ bevor du kommentieren kannst</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
-        <translation>Spalte anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
@@ -9708,10 +10458,10 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+156"/>
         <source>&lt;b&gt;Loading...&lt;b&gt;</source>
-        <translation>&lt;b&gt;Lade...&lt;b&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9749,54 +10499,53 @@ bevor du kommentieren kannst</translation>
     <message>
         <location line="+5"/>
         <source>Last seen at friends:</source>
-        <translation>Zuletzt bei Freunden gesehen:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+60"/>
         <source>Moderators</source>
-        <translation>Moderatoren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+116"/>
         <source>Missing Message:
 This message is missing. You should receive it later.</source>
-        <translation>Fehlende Nachricht:
-Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
-        <translation>Kein Ergebnis.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Found %1 results.</source>
-        <translation>%1 Ergebnisse gefunden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
-        <translation>Diese Nachricht konnte nicht abgerufen werden. Ist die Datenbank derzeit überlastet?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>No data for this message. Is the database corrupted?</source>
-        <translation>Keine Daten für diese Nachricht. Ist die Datenbank beschädigt?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>More than one entry for this message. Is the database corrupted?</source>
-        <translation>Mehr als ein Eintrag für diese Nachricht. Ist die Datenbank beschädigt?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
-        <translation>(Neueste) </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>(Old) </source>
-        <translation>(Alt) </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+403"/>
@@ -9855,12 +10604,12 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Foren</translation>
@@ -9891,16 +10640,35 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>Andere Foren</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Warten</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Abrufen</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Icon hinzufügen</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Schlüsselempfänger können in eingeschränkten Gruppen veröffentlichen und können private Kanäle ansehen und darin veröffentlichen</translation>
     </message>
@@ -9909,14 +10677,22 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <source>Share Publish Key</source>
         <translation>Veröffentlichungsschlüssel freigeben</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">Markiere die Nachbarn, an welche du den privaten Veröffentlichungsschlüssel verteilen willst</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Schlüssel verteilen an</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Nachrichtenverteilung</translation>
     </message>
@@ -9924,7 +10700,7 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Öffentlich</translation>
     </message>
@@ -9943,6 +10719,14 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <source>New Thread</source>
         <translation>Neues Thema</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Notwendig</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Verschlüsselte Nachr.</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9984,7 +10768,7 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>Spamschutz</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Kommentare:</translation>
     </message>
@@ -9994,7 +10778,7 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <location line="+60"/>
         <location line="+47"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
         <location line="-28"/>
@@ -10007,14 +10791,14 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>Anti-Spam:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
-        <translation>Alle Leute</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>My Contacts</source>
-        <translation>Meine Kontakte</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -10023,14 +10807,14 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation>Beschränkt auf Kreis:</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
-        <translation>Beschränkt auf deine Freunde</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+57"/>
@@ -10045,31 +10829,31 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>Nachrichtenverfolggung</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>PGP-Signatur erforderlich</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
-        <translation>Nur Freundesknoten in der Gruppe </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+83"/>
         <location line="+85"/>
         <source>Failed to Prepare Group MetaData: </source>
-        <translation>Gruppenmetadaten konnten nicht vorbereitet werden: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-9"/>
@@ -10077,28 +10861,30 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>Bitte Name hinzufügen</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>PGP-Signatur aus bekannter Kennung erforderlich</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation>[Keine]</translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Gruppenlogo laden</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Gruppenänderungen übermitteln</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Aufbereiten der Gruppenmetadaten fehlgeschlagen - bitte überprüfen</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Wird zum Senden von Rückmeldungen genutzt werden</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Eigentümer:</translation>
     </message>
@@ -10108,12 +10894,12 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>Gib hier eine aussagekräftige Beschreibung ein</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10123,14 +10909,14 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>Letzter Beitrag</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nachrichten werden weit über Ihre Freundesknoten hinaus verbreitet, solange die Leute den Kanal/das Forum/den von Ihnen erstellten Beitrag abonnieren.&lt;/p&gt;&lt;/body&gt;&lt;/html &gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread among Retroshare nodes that host one of the identities listed as member of the circle and who also subscribe the media. Only these nodes will be able to see that this forum/channel/posted media exists. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nachrichten werden an Retroshare-Knoten verteilt, die eine der als Mitglied des Kreises aufgeführten Identitäten hosten und auch die Medien abonnieren. Nur diese Knoten können sehen, dass dieses Forum/dieser Kanal/dieses gepostete Medium existiert. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -10140,12 +10926,12 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     <message>
         <location line="+33"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will only be distributed to the selected subset of your friend nodes. They will not forward messages with each other, but only use your own node as a central hub to distribute them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nachrichten werden nur an die ausgewählte Teilmenge Ihrer Freundesknoten verteilt. Sie leiten Nachrichten nicht untereinander weiter, sondern nutzen nur Ihren eigenen Knoten als zentralen Hub, um sie zu verteilen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Restricted node group </source>
-        <translation>Auf Knotengruppe </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-154"/>
@@ -10155,27 +10941,27 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     <message>
         <location line="-272"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click to add a Logo&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hier klicken, um ein Logo hinzuzufügen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+52"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The identity here can be used to send feedback.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Die Identität hier kann zum Senden von Feedback verwendet werden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Add moderators</source>
-        <translation>Moderatoren hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+74"/>
         <source>Re&amp;quired</source>
-        <translation>Erforderlich</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Encrypted &amp;Msgs</source>
-        <translation>Verschlüsselte &amp;Nachrichten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+130"/>
@@ -10198,12 +10984,7 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation>Autor:</translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Beliebtheit</translation>
     </message>
@@ -10216,25 +10997,30 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <location line="+59"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-12"/>
         <source>Moderators:</source>
-        <translation>Moderatoren:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
-        <translation>Erstellt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
-        <translation>Erstellen</translation>
+        <translation type="unfinished">Erstellen</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Autor</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>GxsIdLabel</translation>
     </message>
@@ -10242,7 +11028,7 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Lade</translation>
     </message>
@@ -10279,17 +11065,17 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     <message>
         <location line="-24"/>
         <source>Remove this search</source>
-        <translation>Entfernen Sie diese Suche</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove all searches</source>
-        <translation>Alle Suchanfragen entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Request data</source>
-        <translation>Daten anfordern</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+34"/>
@@ -10302,9 +11088,9 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>Details bearbeiten</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
-        <translation>Synchronisieren Sie die Beiträge der letzten...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -10351,20 +11137,20 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     <message>
         <location line="-7"/>
         <source>Store posts for at most...</source>
-        <translation>Speichern Sie Beiträge höchstens...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Share publish permissions...</source>
-        <translation>Veröffentlichungsberechtigungen teilen...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
-        <translation>Suchen nach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare-Link kopieren</translation>
     </message>
@@ -10387,7 +11173,7 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Keine Signatur</translation>
     </message>
@@ -10400,39 +11186,50 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Lade</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Nicht gefunden</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Keine Signatur</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Gebannt]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Authentifizierung</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>unbekannter Schlüssel</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">anonym</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
-        <translation>Lade...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>[None]</source>
-        <translation>[Keine]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation>[Niemand]</translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Identitätsname</translation>
     </message>
@@ -10444,7 +11241,11 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     <message>
         <location line="+5"/>
         <source>Node</source>
-        <translation>Knoten</translation>
+        <translation type="unfinished">Netzknoten</translation>
+    </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">Unterzeichnet&amp;nbsp;von</translation>
     </message>
     <message>
         <location line="-14"/>
@@ -10452,84 +11253,80 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>[Unbekannt]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation>[Niemand]</translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
         <location filename="../gui/statistics/GxsIdStatistics.ui" line="+14"/>
         <source>Router Statistics</source>
-        <translation>Routerstatistiken</translation>
+        <translation type="unfinished">Routerstatistiken</translation>
     </message>
 </context>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
-        <translation>Gesamte Identitäten: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Usage types</source>
-        <translation>Nutzungsarten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Usage per service</source>
-        <translation>Nutzung pro Service</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Identity age (in weeks):</source>
-        <translation>Alter der Identität (in Wochen):</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
         <source>Last used (hours ago): </source>
-        <translation>Zuletzt verwendet (vor Stunden): </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+104"/>
         <source>Managed keys</source>
-        <translation>Verwaltete Schlüssel</translation>
+        <translation type="unfinished">Verwaltete Schlüssel</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> : Service ID =</source>
-        <translation> : Dienst-ID =</translation>
+        <translation type="unfinished"> : Dienst-ID =</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Routing matrix  (</source>
-        <translation>Routingmatrix  (</translation>
+        <translation type="unfinished">Routingmatrix  (</translation>
     </message>
     <message>
         <location line="+57"/>
         <source>[Unknown identity]</source>
-        <translation>[Unbekannte Identität]</translation>
+        <translation type="unfinished">[Unbekannte Identität]</translation>
     </message>
 </context>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
-        <translation>[Unbekannt]</translation>
+        <translation type="unfinished">[Unbekannt]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
-        <translation>Lade...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -10542,27 +11339,27 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="+161"/>
         <source>Random Bias: %1</source>
-        <translation>Zufällige Tendenz: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS Groups:</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Service: %1 (%2) - Group ID: %3,	 policy: %4, 	status: %5, 	last contact: %6</source>
-        <translation>Dienst: %1 (%2) – Gruppen-ID: %3, Richtlinie: %4, Status: %5, letzter Kontakt: %6</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Peer: %1:	status: %2/%3, 	last contact: %4, 	Master key: %5.</source>
-        <translation>Peer: %1:\t status: %2/%3, \t letzter Kontakt: %4, \t Master-Schlüssel: %5.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Peer: %1: no information available</source>
-        <translation>Peer: %1: keine Informationen verfügbar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -10570,108 +11367,108 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.ui" line="+14"/>
         <source>Router Statistics</source>
-        <translation>Routerstatistiken</translation>
+        <translation type="unfinished">Routerstatistiken</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>GroupBox</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+22"/>
         <source>ID</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Destination</source>
-        <translation>Ziel</translation>
+        <translation type="unfinished">Ziel</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Data status</source>
-        <translation>Datenstatus</translation>
+        <translation type="unfinished">Datenstatus</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Data size</source>
-        <translation>Datengröße</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Data hash</source>
-        <translation>Datenhash</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Sending time</source>
-        <translation>Sendezeit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Sending time (secs ago)</source>
-        <translation>Sendezeit (vergangene Sekunden)</translation>
+        <translation type="unfinished">Sendezeit (vergangene Sekunden)</translation>
     </message>
     <message>
         <location line="+41"/>
         <source>Publish TS</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Number of messages </source>
-        <translation>Anzahl der Nachrichten </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-51"/>
         <source>Group ID</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Destination ID</source>
-        <translation>Ziel-ID</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Gxs Transport Groups:</source>
-        <translation>Gxs-Transportgruppen:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Group ID / Author</source>
-        <translation>Gruppen-ID/Autor</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
-        <translation>Lokale Datengröße</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Subscribed</source>
-        <translation>Abonniert</translation>
+        <translation type="unfinished">Abonniert</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Popularity</source>
-        <translation>Beliebtheit</translation>
+        <translation type="unfinished">Beliebtheit</translation>
     </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
         <source>View details</source>
-        <translation>Details anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Unknown Peer</source>
-        <translation>Unbekannter Nachbar</translation>
+        <translation type="unfinished">Unbekannter Nachbar</translation>
     </message>
     <message>
         <location line="+42"/>
         <source>Pending data items</source>
-        <translation>Ausstehende Datenelemente</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
@@ -10689,6 +11486,41 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <translation>Nein</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">Authentifizierte Tunnel:</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">Tunnelkennung: %1</translation>
+    </message>
+    <message>
+        <source>from: %1</source>
+        <translation type="vanished">von: %1</translation>
+    </message>
+    <message>
+        <source>to: %1</source>
+        <translation type="vanished">an: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">Status: %1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">Gesendet gesamt: %1 bytes</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">Empfangen gesamt: %1 bytes</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Unbekannter Nachbar</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10713,17 +11545,17 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
     <message>
         <location filename="../gui/statusbar/hashingstatus.cpp" line="+78"/>
         <source>Examining shared files...</source>
-        <translation>Prüfe freigegebene Dateien...</translation>
+        <translation type="unfinished">Prüfe freigegebene Dateien...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hashing file</source>
-        <translation>Erstelle Prüfsumme</translation>
+        <translation type="unfinished">Erstelle Prüfsumme</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Saving file index...</source>
-        <translation>Speichere Dateiindex...</translation>
+        <translation type="unfinished">Speichere Dateiindex...</translation>
     </message>
 </context>
 <context>
@@ -10906,7 +11738,7 @@ Diese Nachricht fehlt. Sie sollten es später erhalten.</translation>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10922,7 +11754,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Autoren</translation>
     </message>
@@ -10941,7 +11773,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11019,24 +11851,28 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
-        <translation>Freund hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+112"/>
         <source>Do you need help with Retroshare?</source>
-        <translation>Benötigen Sie Hilfe bei Retroshare?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Teilen Sie Ihre RetroShare-ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-63"/>
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
-        <translation>Dies ist Ihre Retroshare-ID. Kopieren Sie es und teilen Sie es mit Ihren Freunden!</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">Zertifikatsdatei hinzufügen</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11047,20 +11883,19 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-3"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kopieren Sie Ihre RetroShare-ID in die Zwischenablage&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
         <source>Open Source cross-platform, 
 private and secure decentralized communication platform.
 </source>
-        <translation>Plattformübergreifendes Open Source,
-Private und sichere dezentrale Kommunikationsplattform.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
-        <translation>Haben Sie eine Retroshare-ID von einem Freund erhalten?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+47"/>
@@ -11068,17 +11903,17 @@ Private und sichere dezentrale Kommunikationsplattform.</translation>
         <translation>Webhilfe öffnen</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
-        <translation>Dein Zertifikat in die Zwischenablage kopieren</translation>
+        <translation type="unfinished">Dein Zertifikat in die Zwischenablage kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Save your Cert into a File</source>
-        <translation>Zertifikat als Datei speichern</translation>
+        <translation type="unfinished">Zertifikat als Datei speichern</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>Über E-Mail senden</translation>
     </message>
@@ -11090,84 +11925,65 @@ Private und sichere dezentrale Kommunikationsplattform.</translation>
     <message>
         <location line="+3"/>
         <source>Recommend friends to each others</source>
-        <translation>Empfehlen Sie einander Freunde weiter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Copy your Retroshare ID to Clipboard</source>
-        <translation>Kopieren Sie Ihre Retroshare-ID in die Zwischenablage</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation>Aktuelle lokale IP einschließen</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation>Aktuelle externe IP einschließen</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation>Meinen DNS einbeziehen</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation>Beziehen Sie den gesamten IP-Verlauf ein</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
-        <translation>Geben Sie alle Ihre bekannten IP-Adressen an</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
-        <translation>Verwenden Sie das alte Zertifikatsformat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Displays the certificate format used up to version 0.6.5
 Old Retroshare nodes will not understand the
 new short format</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
-        <translation>Verwenden Sie das neue (kurze) Zertifikatsformat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation>Ihr Retroshare-Zertifikat wurde in die Zwischenablage kopiert, fügen Sie es ein und senden Sie es per E-Mail oder auf andere Weise an Ihren Freund</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation>Ihre Retroshare-ID wurde in die Zwischenablage kopiert, fügen Sie es ein und senden Sie es per E-Mail oder auf andere Weise an Ihren Freund</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
-        <translation>RetroShare-Einladung</translation>
+        <translation type="unfinished">RetroShare-Einladung</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation>Speichern als...</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
-        <translation>RetroShare-Zertifikat (*.rsc );;Alle Dateien (*)</translation>
+        <translation type="unfinished">RetroShare-Zertifikat (*.rsc );;Alle Dateien (*)</translation>
     </message>
     <message>
         <location filename="../gui/HomePage.h" line="+46"/>
@@ -11240,7 +12056,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+17"/>
         <source>Auto-Ban all identities signed by the same node</source>
-        <translation type="unfinished">Auto-Ban aller Identitäten, die von demselben Knoten unterzeichnet wurden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+83"/>
@@ -11389,17 +12205,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+12"/>
         <source>Negative (Banned by you)</source>
-        <translation>Negativ (von Ihnen verbannt)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Positive (according to your friends)</source>
-        <translation type="unfinished">Positiv (nach Meinung Ihrer Freunde)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Negative (according to your friends)</source>
-        <translation>Negativ (nach Meinung Ihrer Freunde)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+99"/>
@@ -11425,14 +12241,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Reputation</translation>
     </message>
@@ -11442,12 +12258,12 @@ p, li { white-space: pre-wrap; }
         <translation>Suchen</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>Anonyme ID</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Neue Identität erstellen</translation>
     </message>
@@ -11457,7 +12273,7 @@ p, li { white-space: pre-wrap; }
         <translation>Neuen Kreis erstellen</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>Personen</translation>
     </message>
@@ -11472,27 +12288,27 @@ p, li { white-space: pre-wrap; }
         <translation>Person</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
-        <translation>Auto-Ban aller Identitäten, die von demselben Knoten unterzeichnet wurden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
-        <translation>Freund Bewertungen:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Positive Stimmen</translation>
     </message>
@@ -11508,39 +12324,29 @@ p, li { white-space: pre-wrap; }
         <translation>Negative Stimmen</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
-        <translation>Erstellt am:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation>Auto-Ban-Profil</translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation>Identität editieren</translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
-        <translation>Nutzungsstatistiken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Kreise</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Kreisname</translation>
     </message>
@@ -11560,20 +12366,18 @@ p, li { white-space: pre-wrap; }
         <translation>Persönliche Kreise</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Identität bearbeiten</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Identität löschen</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Chatte mit diesem Nachbarn</translation>
     </message>
@@ -11583,78 +12387,78 @@ p, li { white-space: pre-wrap; }
         <translation>Stellt einen Fernchat mit diesem Nachbarn her</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
-        <translation>Eigentümerknoten-ID :</translation>
+        <translation>Eigentümerknoten-ID</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Identitätsname :</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>Identitäts-ID</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Nachricht senden</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Identitätsinformationen</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Identitäts-ID :</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Eigentümerknotenname :</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
-        <translation>Neu erstellen...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Einladung senden</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>Deine Meinung:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Negativ</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>Neutral</translation>
     </message>
@@ -11665,17 +12469,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positiv</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Insgesamt:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anonym</translation>
     </message>
@@ -11690,24 +12494,24 @@ p, li { white-space: pre-wrap; }
         <translation>Kennung suchen</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Diese Identität gehört dir</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
-        <translation>Meine Identitäten</translation>
+        <translation>Meine eigenen Identitäten</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>Meine Kontakte</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11719,15 +12523,10 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Linked to my node</source>
-        <translation>Verknüpft mit meinem Knoten</translation>
-    </message>
-    <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>Andere Kreise</translation>
     </message>
@@ -11737,7 +12536,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>Kreiskennung:</translation>
     </message>
@@ -11774,17 +12573,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>User (Can only request membership).</source>
-        <translation>Benutzer (kann nur die Mitgliedschaft beantragen).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Distribution: </source>
-        <translation>Verteilung: </translation>
+        <translation>Verteilung:</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>subscribed (Receive/forward membership requests from others and invite list).</source>
-        <translation>abonniert (Empfang/Weiterleitung von Beitrittsanfragen anderer und Einladungsliste).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -11804,7 +12603,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Full member (you have access to data limited to this circle)</source>
-        <translation>Vollmitglied (Sie haben Zugang zu Daten, die auf diesen Kreis beschränkt sind)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11812,7 +12611,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>Identitätskennung: </translation>
     </message>
@@ -11834,7 +12633,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Subscription request pending</source>
-        <translation>Abonnementanforderung ausstehend</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11842,14 +12641,14 @@ p, li { white-space: pre-wrap; }
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>Eingeladen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Subscription pending</source>
-        <translation>Abonnement ausstehend</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -11857,7 +12656,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mitglied</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>Kreis bearbeiten</translation>
     </message>
@@ -11869,12 +12668,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+41"/>
         <source>Request subscription</source>
-        <translation>Abonnement anfordern</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Accept circle invitation</source>
-        <translation>Kreiseinladung annehmen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
@@ -11884,7 +12683,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>Cancel subscribe request</source>
-        <translation>Abo-Anfrage abbrechen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+40"/>
@@ -11892,7 +12691,7 @@ p, li { white-space: pre-wrap; }
         <location line="+26"/>
         <location line="+2"/>
         <source>for identity </source>
-        <translation>für Identität </translation>
+        <translation>für Identität</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -11902,10 +12701,10 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Grant membership</source>
-        <translation>Mitgliedschaft gewähren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11913,7 +12712,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Unbekannter Knoten]</translation>
@@ -11922,7 +12721,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-227"/>
         <location line="+1"/>
         <source>Unverified signature from node </source>
-        <translation>Ungeprüfte Signatur vom Knoten </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -11943,7 +12742,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+3"/>
         <source>Identity owned by you, linked to your Retroshare node but not yet validated</source>
-        <translation>Identität, die Ihnen gehört und mit Ihrem Retroshare-Knoten verknüpft, aber noch nicht validiert ist</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11956,19 +12755,19 @@ These identities will soon be not supported anymore.</source>
         <translation>Anonyme Identität</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>GxsMail author </source>
-        <translation>GxsMail Autor</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>GxsCircles</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -11983,7 +12782,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+3"/>
         <source>Group author for group %1 in service %2</source>
-        <translation>Gruppenautor für Gruppe %1 im Dienst %2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
@@ -11998,7 +12797,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+2"/>
         <source>Message</source>
-        <translation>Nachricht</translation>
+        <translation type="unfinished">Nachricht</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12008,7 +12807,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+8"/>
         <source>Message in chat room %1</source>
-        <translation>Nachricht im Chatraum %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -12028,43 +12827,48 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+8"/>
         <source>Membership verification in circle &quot;%1&quot; (%2).</source>
-        <translation>Verifizierung der Mitgliedschaft im Kreis &quot;%1&quot; (%2).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Membership verification in circle (ID=%1).</source>
-        <translation>Verifizierung der Mitgliedschaft im Kreis (ID=%1).</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>This identity link was copied to your clipboard. Paste it in a mail, or a message to transmit the identity to someone.</source>
-        <translation>Dieser Identitätslink wurde in Ihre Zwischenablage kopiert. Fügen Sie ihn in eine E-Mail oder eine Nachricht ein, um die Identität an jemanden zu übermitteln.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-84"/>
         <location line="+21"/>
         <source>Copy identity to clipboard</source>
-        <translation>Identität in die Zwischenablage kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Gebannt</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
-        <translation> positiv </translation>
+        <translation> positiv</translation>
     </message>
     <message>
         <location line="+1"/>
         <source> negative </source>
-        <translation> negativ </translation>
+        <translation> negativ</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -12074,17 +12878,17 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+12"/>
         <source>Negative (Banned by you)</source>
-        <translation>Negativ (von Ihnen verbannt)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Positive (according to your friends)</source>
-        <translation>Positiv (nach Meinung Ihrer Freunde)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Negative (according to your friends)</source>
-        <translation>Negativ (nach Meinung Ihrer Freunde)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
@@ -12101,11 +12905,19 @@ These identities will soon be not supported anymore.</source>
         <source>Forums</source>
         <translation>Foren</translation>
     </message>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Veröffentlicht</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Unbekannt</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12126,6 +12938,10 @@ These identities will soon be not supported anymore.</source>
         <source>Creation of author signature in service %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message/vote/comment</source>
+        <translation type="vanished">Nachricht/Stimme/Kommentar</translation>
+    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12139,18 +12955,22 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+4"/>
         <source>Signature validation in distant tunnel system.</source>
-        <translation>Signaturvalidierung im entfernten Tunnelsystem.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Signature in distant tunnel system.</source>
-        <translation>Signatur im entfernten Tunnelsystem.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">Generische Signatur.</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12162,7 +12982,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Generische Entschlüsselung.</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation>Zu Kontakte hinzufügen</translation>
     </message>
@@ -12199,7 +13019,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+11"/>
         <source>Too many identities</source>
-        <translation>Zu viele Identitäten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
@@ -12212,21 +13032,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Leute</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Dein Avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>Mit Nachbarknoten verknüpft</translation>
     </message>
@@ -12236,7 +13056,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Mit entfernten Netzknoten verknüpft</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Mit befreundetem RetroShare-Netzknoten verknüpft</translation>
     </message>
@@ -12251,7 +13071,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Mit unbekanntem RetroShare-Netzknoten verknüpft</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Mit dieser Person chatten</translation>
     </message>
@@ -12266,12 +13086,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Fernchat mit dieser Person abgelehnt.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>Zuletzt verwendet:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP bekannt</translation>
     </message>
@@ -12291,12 +13111,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Möchtest du diese Identität wirklich löschen?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Im Besitz von</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Netzknotenname:</translation>
     </message>
@@ -12306,7 +13126,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Netzknoten-ID :</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>Wirklich löschen?</translation>
     </message>
@@ -12314,7 +13134,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
@@ -12344,29 +13164,22 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudonym</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
-        <translation>Bild importieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Image files (*.jpg *.png);;All files (*)</source>
-        <translation>Bilddateien (*.jpg *.png);;Alle Dateien (*)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation>Kein Avatar ausgewählt. Von Ihrer neuen Identität wird automatisch ein Standardbild angezeigt.</translation>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation>Verwenden Sie die Maus, um das Bild für Ihren Avatar zu vergrößern und anzupassen. Drücken Sie Entf, um es zu entfernen.</translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Neue Identität</translation>
     </message>
@@ -12380,7 +13193,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12390,12 +13203,7 @@ These identities will soon be not supported anymore.</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation>Kein Avatar ausgewählt</translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Identität bearbeiten</translation>
@@ -12403,60 +13211,64 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+1"/>
         <source>Update</source>
-        <translation>Aktualisieren</translation>
+        <translation type="unfinished">Aktualisieren</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
-        <translation>Profilpasswort erforderlich.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
-        <translation>Identitätserstellung fehlgeschlagen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
-        <translation>Ohne Ihr Profilpasswort können Sie keine mit Ihrem Profil verknüpfte Identität erstellen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
-        <translation>Erfolgreiche Identitätserstellung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Your new identity was successfuly created, its ID is %1.</source>
-        <translation>Ihre neue Identität wurde erfolgreich erstellt, ihre ID ist %1.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Cannot create identity. Something went wrong.</source>
-        <translation>Identität kann nicht erstellt werden. Etwas ist schief gelaufen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cannot create identity. Something went wrong. Check your profile password.</source>
-        <translation>Identität kann nicht erstellt werden. Etwas ist schief gelaufen. Überprüfen Sie Ihr Profilpasswort.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
-        <translation>Die Identitätsaktualisierung ist fehlgeschlagen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot update identity. Something went wrong. Check your profile password.</source>
-        <translation>Identität kann nicht aktualisiert werden. Etwas ist schief gelaufen. Überprüfen Sie Ihr Profilpasswort.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Fehler beim Holen des Schlüssels!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Fehler Schlüssel-ID ungültig</translation>
     </message>
@@ -12471,7 +13283,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Unbekannter Klarname</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Neue Identität erstellen</translation>
     </message>
@@ -12481,14 +13293,9 @@ These identities will soon be not supported anymore.</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
-        <translation>Bild auswählen...</translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+36"/>
@@ -12515,23 +13322,27 @@ These identities will soon be not supported anymore.</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
-        <translation>Erstellen</translation>
+        <translation type="unfinished">Erstellen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished">Abbrechen</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Dein Avatar</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Avatar festlegen</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>Mit deinem Profil verknüpft</translation>
     </message>
@@ -12541,7 +13352,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Du kannst eine oder mehrere Identitäten haben. Sie werden genutzt, um in Chatlobbys, Foren und Kanalkommentaren zu schreiben. Sie dienen als Zieladresse für Fernchat und das RetroShare-Fernnachrichtensystem.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Der Spitzname ist zu kurz. Bitte mindestens %1 Zeichen eingeben.</translation>
     </message>
@@ -12571,18 +13382,18 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+75"/>
         <source>Positive votes</source>
-        <translation>Positive Stimmen</translation>
+        <translation type="unfinished">Positive Stimmen</translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+41"/>
         <source>0</source>
-        <translation>0</translation>
+        <translation type="unfinished">0</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Negative votes</source>
-        <translation>Negative Stimmen</translation>
+        <translation type="unfinished">Negative Stimmen</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -12600,6 +13411,10 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>PGP-Name:</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">GXS-ID:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12615,7 +13430,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
@@ -12625,12 +13440,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Alle markieren</translation>
     </message>
@@ -12649,38 +13464,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Senden</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Bild speichern</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation>Bilddatei speichern</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation>Bilder (*.png *.xpm *.jpg)</translation>
+        <source>Cannot save the image, invalid filename</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
-        <source>Cannot save the image, invalid filename</source>
-        <translation>Das Bild kann nicht gespeichert werden, ungültiger Dateiname</translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation>Bild kopieren</translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
         <source>Not an image</source>
         <translation>Kein Bild</translation>
     </message>
@@ -12690,99 +13493,84 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location filename="../gui/settings/JsonApiPage.ui" line="+14"/>
         <source>Form</source>
-        <translation>Formular</translation>
+        <translation type="unfinished">Formular</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>JSON API Server</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
-        <translation>RetroShare JSON API Server aktivieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
-        <translation>Port:</translation>
+        <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
-        <translation>Listenadresse:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation>Status:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
-        <translation>127.0.0.1</translation>
+        <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tokens should spell as &amp;quot;user:password&amp;quot; where both user and password are alphanumeric strings.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tokens sollten als &amp;quot;Benutzer:Passwort&amp;quot; geschrieben werden, wobei sowohl Benutzer als auch Passwort alphanumerische Zeichenfolgen sind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Add</source>
-        <translation>Hinzufügen</translation>
+        <translation type="unfinished">Hinzufügen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Remove</source>
-        <translation>Entfernen</translation>
+        <translation type="unfinished">Entfernen</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation>Authentifizierte Token:</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
-        <translation>Registrierte Dienste:</translation>
+        <source>Authenticated Tokens</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Apply settings</source>
-        <translation>Einstellungen übernehmen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt; &lt;p&gt;Retroshare stellt eine JSON-API zur Verfügung, die es anderen Programmen ermöglicht, mit seinem Kern zu kommunizieren, indem sie Token-gesteuerte HTTP-Anfragen an http://localhost:[port] stellen.         Bitte lesen Sie in der Retroshare-Dokumentation nach, wie Sie diese Funktion nutzen können. &lt;/p&gt; &lt;p&gt;Wenn Sie nicht wissen, was Sie tun, sollten Sie an dieser Seite nichts ändern müssen.        Die Weboberfläche beispielsweise registriert automatisch ihr eigenes Token für die JSON-API, das in der Liste der authentifizierten Token angezeigt wird, nachdem Sie es aktiviert haben.&lt;/p&gt;&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Ordner öffnen</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Überprüfe...</translation>
     </message>
@@ -12792,19 +13580,19 @@ These identities will soon be not supported anymore.</source>
         <translation>Dateien überprüfen</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
-        <translation>Empfehlen Sie in einer Nachricht an...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Share on channel...</source>
-        <translation>Auf Kanal teilen...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Share on forum...</source>
-        <translation>Im Forum teilen...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+111"/>
@@ -12820,7 +13608,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Freund hinzufügen</translation>
     </message>
@@ -12836,8 +13624,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
@@ -12858,7 +13645,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Schließen</translation>
     </message>
@@ -12869,12 +13656,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Schnellstart-Assistent</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 - eine sichere und dezentralisierte Kommunikationsplattform</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>unfertig</translation>
     </message>
@@ -12903,12 +13690,11 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Meldungen</translation>
     </message>
@@ -12919,35 +13705,31 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Nachrichten öffnen</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Bandbreiten-Graph</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Minimieren</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Maximieren</translation>
     </message>
@@ -12962,12 +13744,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation>Fenster schließen</translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 neue Nachricht</translation>
     </message>
@@ -12997,7 +13774,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>%1 Freunde verbunden</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Möchtest du RetroShare wirklich beenden?</translation>
     </message>
@@ -13017,7 +13794,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Vergewissere dich, dass dieser Link nicht gefälscht ist, um dich auf eine bösartige Webseite zu locken.</translation>
     </message>
@@ -13029,17 +13806,17 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     <message>
         <location line="+1"/>
         <source>Never ask me again</source>
-        <translation>Frag mich nie wieder</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This will be saved only for this session.</source>
-        <translation>Dies wird nur für diese Sitzung gespeichert.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>This will be saved permanently. You&apos;ll need to clean RetroShare.conf to revert.</source>
-        <translation>Dies wird dauerhaft gespeichert. Um dies rückgängig zu machen, müssen Sie die RetroShare.conf wieder zurücksetzen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+33"/>
@@ -13062,13 +13839,12 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Serviceberechtigungsmatrix</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Weboberfläche anzeigen</translation>
     </message>
@@ -13083,7 +13859,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Ordner ist sehr gering (Die aktuelle Grenze ist</translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>Wirklich beenden?</translation>
     </message>
@@ -13092,17 +13868,17 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Verfassen</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Absatz</translation>
     </message>
@@ -13138,12 +13914,12 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Überschrift 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Schriftgröße</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Schrift vergrößern</translation>
     </message>
@@ -13158,32 +13934,32 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Fett</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Ausrichtung</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Ein Bild hinzufügen</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Setzt Schriftart auf Codestil</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Unterstrichen</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Betreff:</translation>
     </message>
@@ -13194,32 +13970,32 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Schlagwörter</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>Adressliste:</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation>Diesen Freund empfehlen</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Textfarbe festlegen</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Texthintergrundfarbe festlegen</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Empfohlene Dateien</translation>
     </message>
@@ -13289,7 +14065,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Blockquote hinzufügen</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Senden an:</translation>
     </message>
@@ -13313,6 +14089,10 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <source>&amp;Justify</source>
         <translation>&amp;Blocksatz</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">Alle Adressen (gemischt)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13324,7 +14104,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>Meine Kontakte</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hallo, &lt;br&gt; ich empfehle dir einen guten Freund von mir. Du kannst ihm vertrauen, wenn du mir vertraust. &lt;br&gt;</translation>
     </message>
@@ -13344,18 +14124,18 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
         <translation>möchte mit dir in RetroShare befreundet sein</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hallo %1,&lt;br&gt;&lt;br&gt;%2 möchte mit dir in RetroShare befreundet sein.&lt;br&gt;&lt;br&gt;Jetzt antworten:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Grüße,&lt;br&gt;Das RetroShare Team</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Nachricht speichern</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Nachricht wurde noch nicht gesendet.
@@ -13367,17 +14147,7 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>RetroShare Link einfügen</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation>Wird nicht antworten</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation>Es hat keinen Sinn, auf eine Benachrichtigung zu antworten!</translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Zu &quot;An&quot; hinzufügen</translation>
     </message>
@@ -13397,7 +14167,7 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Als empfohlen hinzufügen</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Ursprüngliche Nachricht</translation>
     </message>
@@ -13407,21 +14177,21 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Gesendet</translation>
     </message>
@@ -13436,7 +14206,7 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Am %1, schrieb %2:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13446,30 +14216,30 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Fwd:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Möchtest du die Nachricht ohne Betreff senden ?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Bitte gib mindestens einen Empfänger ein.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -13584,13 +14354,13 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>Details</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Datei öffnen...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation>
     </message>
@@ -13610,7 +14380,7 @@ Möchtest du die Nachricht in den Entwürfen speichern?</translation>
         <translation>PDF exportieren</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Nachricht noch nicht versandt.
@@ -13632,48 +14402,48 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Zusätzliche Datei hinzufügen</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
-        <translation>Hallo,&lt;br&gt;Ich möchte mit dir auf RetroShare befreundet sein.&lt;br&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Invite message</source>
-        <translation>Einladungsnachricht</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Respond now:</source>
-        <translation>Jetzt reagieren:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
         <source>Message Size: %1</source>
-        <translation>Größe der Nachricht: %1</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation>Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Von:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2645"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2610"/>
         <source>Friend Nodes</source>
         <translation>Befreundete Netzknoten</translation>
     </message>
@@ -13718,13 +14488,13 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Geordnete Liste (Römisch groß)</translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Danke, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Fernidentität:</translation>
     </message>
@@ -13734,12 +14504,12 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>[Fehlend]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Bitte erstelle eine Identität, um Fernnachrichten zu signieren oder entferne die fernen Nachbarn aus der Zieladressliste.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Netzknotenname &amp; ID:</translation>
     </message>
@@ -13784,7 +14554,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+19"/>
         <source>Load Emoticons</source>
-        <translation type="unfinished">Emoticons laden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -13817,7 +14587,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Neuem Tab</translation>
     </message>
@@ -13827,7 +14597,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Neuem Fenster</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Schlagwort bearbeiten</translation>
     </message>
@@ -13850,7 +14620,7 @@ Möchtest du die Nachricht speichern ?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Betreff:</translation>
     </message>
@@ -13858,35 +14628,35 @@ Möchtest du die Nachricht speichern ?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>You have %1 new mails</source>
-        <translation>Sie haben %1 neue Mails</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 new mail</source>
-        <translation>Sie haben %1 neue Mail</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 new mails</source>
-        <translation>%1 neue Mails</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 new mail</source>
-        <translation>%1 neue Mail</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Empfohlene Dateien</translation>
     </message>
@@ -13896,84 +14666,84 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Alle Dateien herunterladen</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Betreff:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Von:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>An:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Schlagwörter:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
-        <translation>Antworten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reply to All&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allen antworten&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Reply all</source>
-        <translation>Allen antworten</translation>
+        <translation type="unfinished">Allen antworten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forward selected Message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ausgewählte Nachricht weiterleiten&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation>Weiterleiten</translation>
+        <translation type="unfinished">Vorwärts</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="unfinished">Löschen</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;More actions&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Weitere Aktionen&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>More</source>
-        <translation>Mehr</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
-        <translation>Einladung senden</translation>
+        <translation type="unfinished">Einladung senden</translation>
     </message>
     <message>
         <location line="+115"/>
         <source>Message Size:</source>
-        <translation>Nachrichtengröße:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+58"/>
@@ -14004,21 +14774,21 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+5"/>
         <source>Save as</source>
-        <translation>Speichern unter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <location line="+3"/>
         <source>Buttons Text Beside Icon</source>
-        <translation>Button Text neben Icon</translation>
+        <translation type="unfinished">Button Text neben Icon</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Buttons Icon only</source>
-        <translation>Button nur mit Icon</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>%1 als Freund bestätigen</translation>
     </message>
@@ -14028,12 +14798,12 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>%1 als Freund hinzufügen</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
-        <translation>Quelle anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Kein Betreff</translation>
     </message>
@@ -14043,48 +14813,33 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
-        <translation>Du hast eine Freundschaftseinladung erhalten! Du kannst diese Anfrage annehmen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
-        <translation>Sie haben eine Einladung erhalten, um Freunde zu werden! Sie können diese Anfrage annehmen und Ihr eigenes Zertifikat zurückschicken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation>mehr</translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
-        <translation>Quelle des Dokuments</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
         <source>%1 (%2) </source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation>Weniger anzeigen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation>Mehr anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Alle herunterladen</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Dokument drucken</translation>
     </message>
@@ -14099,12 +14854,12 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>HTML-Dateien (*.htm *.html);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Bilde für diese Nachricht immer laden</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Anhangsansicht verstecken</translation>
     </message>
@@ -14126,6 +14881,42 @@ Möchtest du die Nachricht speichern ?</translation>
         <source>Compose</source>
         <translation>Verfassen</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Auf gewählte Nachricht antworten</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Antwort</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Auf gewählte Nachricht an alle Empfänger antworten</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Allen antworten</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Gewählte Nachricht weiterleiten</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Vorwärts</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Gewählte Nachricht entfernen</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Löschen</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Gewählte Nachricht drucken</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14204,7 +14995,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Neue Nachricht</translation>
     </message>
@@ -14214,16 +15005,60 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Verfassen</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Auf gewählte Nachricht antworten</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Antworten</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Auf gewählte Nachricht an alle Empfänger antworten</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Allen antworten</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Gewählte Nachricht weiterleiten</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Weiterleiten</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Gewählte Nachricht entfernen</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Löschen</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Gewählte Nachricht drucken</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Drucken</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Anzeigen</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Schlagwörter</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Posteingang</translation>
@@ -14253,17 +15088,21 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Papierkorb</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Posteingang gesamt:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Ordner</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Schnellansicht</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Drucken...</translation>
@@ -14273,6 +15112,26 @@ Möchtest du die Nachricht speichern ?</translation>
         <source>Print Preview</source>
         <translation>Druckvorschau</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Buttons nur mit Icon</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Button Text neben Icon</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Buttons mit Text</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Buttons Text unter dem Icon</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Text unter dem Icon</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14294,7 +15153,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Weiterleiten</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
@@ -14304,7 +15163,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Von</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -14314,7 +15173,39 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Inhalt</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Klicken, um nach Anhang zu sortieren</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Klicken, um nach Betreff zu sortieren</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Klicken, um nach Gelesen / Ungelesen zu sortieren</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Klicken, um nach Von zu sortieren</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Klicken, um nach Datum zu sortieren</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Klicken, um nach Schlagwörter zu sortieren</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Klicken, um nach Kennzeichnung zu sortieren</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Gewählte Nachricht weiterleiten</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Betreff durchsuchen</translation>
     </message>
@@ -14323,11 +15214,6 @@ Möchtest du die Nachricht speichern ?</translation>
         <source>Search From</source>
         <translation>Von durchsuchen</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14354,14 +15240,14 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Anhänge durchsuchen</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation>Markiert</translation>
+        <translation>Gekennzeichnet</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14371,12 +15257,12 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+10"/>
         <source>Spam</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Attachment</source>
-        <translation>Anhang</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+136"/>
@@ -14406,7 +15292,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+5"/>
         <source>Mark as Junk</source>
-        <translation>Als Junk markieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
@@ -14435,8 +15321,8 @@ Möchtest du die Nachricht speichern ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
-        <translation>In Personen anzeigen</translation>
+        <source>Show author in People</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
@@ -14446,51 +15332,56 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location line="+94"/>
         <source>No message available in your %1.</source>
-        <translation>In Ihrem %1 ist keine Nachricht verfügbar.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
-        <translation>Keine Nachricht mit %1-Tag verfügbar.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>No %1 message available.</source>
-        <translation>Keine %1-Nachricht verfügbar.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>No starred message available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
-        <translation>Keine markierte Nachricht verfügbar. Mithilfe von Sternen können Sie Nachrichten einen besonderen Status zuweisen, um sie leichter auffindbar zu machen. Um eine Nachricht zu markieren, klicken Sie auf den hellgrauen Stern neben einer Nachricht.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation>Eine Löschung wird nicht empfohlen</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation>Nachrichten in diesem Feld werden beim Empfang automatisch gelöscht. Das manuelle Löschen einer Nachricht garantiert nicht, dass die Nachricht nicht zugestellt wird. Nachrichten, die nicht zugestellt werden können, bleiben jedoch auf unbestimmte Zeit hier. Möchten Sie fortfahren und löschen?</translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Entwürfe</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
-        <translation>Keine Box ausgewählt.</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Es sind keine gekennzeichneten Nachrichten vorhanden. Durch die Kennzeichnung kannst du Nachrichten mit einem speziellen Status versehen, sodass sie leichter zu finden sind. Klicke zum Kennzeichnen einer Nachricht auf den hellgrauen Stern neben der jeweiligen Nachricht.</translation>
+    </message>
+    <message>
+        <source>No system messages available.</source>
+        <translation type="vanished">Keine Systemnachrichten vorhanden.</translation>
     </message>
     <message>
-        <location line="-1463"/>
         <source>To</source>
-        <translation>An</translation>
+        <translation type="vanished">An</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Klicken, um nach Empfänger zu sortieren</translation>
+    </message>
+    <message>
+        <source>This message goes to a distant person.</source>
+        <translation type="vanished">Diese Nachricht geht zu einer entfernten Person.</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14498,10 +15389,30 @@ Möchtest du die Nachricht speichern ?</translation>
         <source>Total:</source>
         <translation>Gesamt:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Nachrichten</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Anklicken, um nach Signatur zu sortieren</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Diese Nachricht wurde signiert und die Signatur stimmt überein.</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Diese Nachricht wurde signiert und die Signatur stimmt nicht überein.</translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">Diese Nachricht kommt von einer entfernten Person.</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -14525,29 +15436,19 @@ Möchtest du die Nachricht speichern ?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation>Bild speichern</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation>Bild kopieren</translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Als Klartext einfügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Spoiler</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select text to hide, then push this button</source>
-        <translation>Wählen Sie den auszublendenden Text aus und drücken Sie dann diese Taste</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -14565,7 +15466,7 @@ Möchtest du die Nachricht speichern ?</translation>
     <message>
         <location filename="../gui/feeds/MsgItem.ui" line="+149"/>
         <source>Send Invite</source>
-        <translation>Einladung senden</translation>
+        <translation type="unfinished">Einladung senden</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14589,7 +15490,7 @@ Möchtest du die Nachricht speichern ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -14599,19 +15500,19 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Element entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
-        <translation>von</translation>
+        <translation type="unfinished">von</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Reply to invite</source>
-        <translation>Auf Einladung antworten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>This message invites you to make friend! You may accept this request.</source>
-        <translation>Diese Nachricht lädt Sie ein, Freundschaft zu schließen! Sie können diese Anfrage annehmen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -14634,7 +15535,7 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Wartend</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
@@ -14775,17 +15676,17 @@ Möchtest du die Nachricht speichern ?</translation>
         <translation>Nachbar-ID</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Unbenutzte Schlüssel entfernen...</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove this key</source>
-        <translation>Diesen Schlüssel entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Schlüsselbund bereinigen</translation>
     </message>
@@ -14803,14 +15704,7 @@ Anmerkungen: Dein alter Schlüsselbund wird gesichert.
  Die Entfernung kann fehlschlagen, wenn mehrere Instanzen von Retroshare auf der selben Maschine laufen.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation>Sie haben %1 akzeptierte Peers unter anderen ausgewählt,
- Bist du sicher, dass du sie wieder entfreunden möchtest?</translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Schlüsselbund-Informationen</translation>
@@ -14821,8 +15715,8 @@ Anmerkungen: Dein alter Schlüsselbund wird gesichert.
 For security, your keyring was previously backed-up to file 
 
 </source>
-        <translation>%1 Schlüssel wurden aus dem Schlüsselbund entfernt. 
-Der Schlüsselbund wurde aus Sicherheitsgründen zuvor in einer Datei gesichert. 
+        <translation>%1 Schlüssel wurden aus dem Schlüsselbund entfernt.
+Der Schlüsselbund wurde aus Sicherheitsgründen zuvor in einer Datei gesichert.
 
 </translation>
     </message>
@@ -14846,13 +15740,18 @@ Der Schlüsselbund wurde aus Sicherheitsgründen zuvor in einer Datei gesichert.
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Dateninkonsistenz im Schlüsselbund. Dies ist wahrscheinlich ein Bug. Bitte die Entwickler kontaktieren.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>Einen neuen Netzknoten exportieren/erstellen</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Nur vertrauenswürdige Schlüssel</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Name suchen</translation>
     </message>
@@ -14862,12 +15761,12 @@ Der Schlüsselbund wurde aus Sicherheitsgründen zuvor in einer Datei gesichert.
         <translation>Nachbar-ID suchen</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>Profildetails...</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14876,6 +15775,13 @@ Reported error:</source>
  Gemeldeter Fehler:</translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Netzwerk</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14902,299 +15808,296 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
-        <translation>Offline-Freunde</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Offline Friends</source>
-        <translation>Offline-Freunde anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Status</source>
-        <translation>Status</translation>
+        <translation type="unfinished">Status</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show status</source>
-        <translation>Status anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
-        <translation>Gruppen</translation>
+        <translation type="unfinished">Gruppen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show groups</source>
-        <translation>Zeige Gruppen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>export friendlist</source>
-        <translation>Freundesliste exportieren</translation>
+        <translation type="unfinished">Freundesliste exportieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>export your friendlist including groups</source>
-        <translation>Exportieren Sie Ihre Freundesliste einschließlich Gruppen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>import friendlist</source>
-        <translation>Freundesliste importieren</translation>
+        <translation type="unfinished">Freundesliste importieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>import your friendlist including groups</source>
-        <translation>Importieren Sie Ihre Freundesliste einschließlich Gruppen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
-        <translation>Kennung suchen</translation>
+        <translation type="unfinished">Kennung suchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Online friends on top</source>
-        <translation>Online-Freunde an der Spitze</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
-        <translation>Elemente anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
-        <translation>Letzter Kontakt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>IP</source>
-        <translation>IP</translation>
+        <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
-        <translation>Gruppe</translation>
+        <translation type="unfinished">Gruppe</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Friend</source>
-        <translation>Freund</translation>
+        <translation type="unfinished">Freund</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Node</source>
-        <translation>Netzknoten</translation>
+        <translation type="unfinished">Netzknoten</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>UNKNOWN TYPE</source>
-        <translation>UNBEKANNTER TYP</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Edit Group</source>
-        <translation>Gruppe ändern</translation>
+        <translation type="unfinished">Gruppe ändern</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove Group</source>
-        <translation>Gruppe entfernen</translation>
+        <translation type="unfinished">Gruppe entfernen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Profile details</source>
-        <translation>Profildetails</translation>
+        <translation type="unfinished">Profildetails</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Deny connections</source>
-        <translation>Verbindungen ablehnen</translation>
+        <translation type="unfinished">Verbindungen ablehnen</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Add to group</source>
-        <translation>Zu Gruppe hinzufügen</translation>
+        <translation type="unfinished">Zu Gruppe hinzufügen</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Move to group</source>
-        <translation>In Gruppe verschieben</translation>
+        <translation type="unfinished">In Gruppe verschieben</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Create new group</source>
-        <translation>Neue Gruppe erstellen</translation>
+        <translation type="unfinished">Neue Gruppe erstellen</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Remove from group </source>
-        <translation>Aus der Gruppe entfernen </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove from all groups</source>
-        <translation>Aus allen Gruppen entfernen</translation>
+        <translation type="unfinished">Aus allen Gruppen entfernen</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Chat</source>
-        <translation>Chat</translation>
+        <translation type="unfinished">Chat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Send message to this node</source>
-        <translation>Nachricht an diesen Knoten senden</translation>
+        <translation type="unfinished">Nachricht an diesen Knoten senden</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Node details</source>
-        <translation>Knotendetails</translation>
+        <translation type="unfinished">Knotendetails</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Recommend this node to...</source>
-        <translation>Diesen Knoten empfehlen an...</translation>
+        <translation type="unfinished">Diesen Knoten empfehlen an...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Attempt to connect</source>
-        <translation>Verbindung versuchen</translation>
+        <translation type="unfinished">Verbindung versuchen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy certificate link</source>
-        <translation>Zertifikat-Link kopieren</translation>
+        <translation type="unfinished">Zertifikat-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Remove Friend Node</source>
-        <translation>Freundknoten entfernen</translation>
+        <translation type="unfinished">Freundknoten entfernen</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Paste certificate link</source>
-        <translation>Zertifikat-Link einfügen</translation>
+        <translation type="unfinished">Zertifikat-Link einfügen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Expand all</source>
-        <translation>Alle erweitern</translation>
+        <translation type="unfinished">Alle erweitern</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Collapse all</source>
-        <translation>Alle reduzieren</translation>
+        <translation type="unfinished">Alle reduzieren</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
-        <translation>Möchtest du diesen Netzknoten entfernen?</translation>
+        <translation type="unfinished">Möchtest du diesen Netzknoten entfernen?</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Do you want to remove this Friend?</source>
-        <translation>Möchtest du diesen Freund entfernen?</translation>
+        <translation type="unfinished">Möchtest du diesen Freund entfernen?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
-        <translation>Fertig!</translation>
+        <translation type="unfinished">Fertig!</translation>
     </message>
     <message>
         <location line="-17"/>
         <source>Your friendlist is stored at:
 </source>
-        <translation>Deine Freundesliste wird gespeichert unter:
+        <translation type="unfinished">Deine Freundesliste wird gespeichert unter:
 </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 (keep in mind that the file is unencrypted!)</source>
-        <translation>
-(Beachten Sie, dass die Datei unverschlüsselt ist!)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
         <location line="+7"/>
         <source>Your friendlist was imported from:
 </source>
-        <translation>Deine Freundesliste wurde importiert aus:
+        <translation type="unfinished">Deine Freundesliste wurde importiert aus:
 </translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Done - but errors happened!</source>
-        <translation>Fertig - aber Fehler sind aufgetreten!</translation>
+        <translation type="unfinished">Fertig - aber Fehler sind aufgetreten!</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>
 at least one peer was not added</source>
-        <translation>
-Mindestens ein Peer wurde nicht hinzugefügt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 at least one peer was not added to a group</source>
-        <translation>
-Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Select file for importing your friendlist from</source>
-        <translation>Wählen Sie die Datei aus, aus der Sie Ihre Freundesliste importieren möchten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+7"/>
         <source>XML File (*.xml);;All Files (*)</source>
-        <translation>XML-Datei (*.xml);;Alle Dateien (*)</translation>
+        <translation type="unfinished">XML-Datei (*.xml);;Alle Dateien (*)</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Select a file for exporting your friendlist to</source>
-        <translation>Wählen Sie eine Datei aus, in die Sie Ihre Freundesliste exportieren möchten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
         <location line="+116"/>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="unfinished">Fehler</translation>
     </message>
     <message>
         <location line="-115"/>
         <source>File is not writeable!
 </source>
-        <translation>Datei ist nicht schreibbar!
+        <translation type="unfinished">Datei ist nicht schreibbar!
 </translation>
     </message>
     <message>
         <location line="+116"/>
         <source>File is not readable!
 </source>
-        <translation>Datei ist nicht lesbar!
+        <translation type="unfinished">Datei ist nicht lesbar!
 </translation>
     </message>
 </context>
@@ -15229,9 +16132,13 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">Protokolleinträge</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
-        <translation>Aktivitätsstream</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
@@ -15244,7 +16151,11 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <translation>Alle entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Dies ist ein Test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>Neueste oben</translation>
     </message>
@@ -15254,14 +16165,18 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <translation>Älteste oben</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source>Log</source>
+        <translation type="vanished">Protokoll</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
-        <translation>Aktivität</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15269,22 +16184,22 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     <message>
         <location filename="../gui/feeds/NewsFeedUserNotify.cpp" line="+52"/>
         <source>You have %1 logged events</source>
-        <translation>Sie haben %1 protokollierte Ereignisse</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 logged event</source>
-        <translation>Sie haben %1 protokolliertes Ereignis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 logged events</source>
-        <translation>%1 protokollierte Ereignisse</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 logged event</source>
-        <translation>%1 protokolliertes Ereignis</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -15314,6 +16229,10 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Sicherheit</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15335,6 +16254,10 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Verbindungsversuch</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15351,10 +16274,14 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <source>Ip security</source>
         <translation>IP-Sicherheit</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">Protokoll</translation>
+    </message>
     <message>
         <location line="-92"/>
         <source>Activity</source>
-        <translation type="unfinished">Aktivität</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
@@ -15413,6 +16340,10 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <source>Chat rooms</source>
         <translation>Chaträume</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">Chaträume</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15488,28 +16419,36 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Alle Hinweise vorübergehend deaktivieren</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Neuigkeiten</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Benachrichtigungsfeld</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">Alle ungelesenen Nachrichten zählen</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation>Passphrase erforderlich</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You need to sign your node&apos;s certificate.</source>
-        <translation>Sie müssen das Zertifikat Ihres Knotens signieren.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You need to sign your forum/chatrooms identity.</source>
-        <translation>Sie müssen Ihre Forum-/Chatroom-Identität unterschreiben.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -15517,12 +16456,12 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <translation>Falsches Passwort!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
-        <translation>Bitte geben Sie Ihr Retroshare-Passwort ein</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Nicht registriertes Plug-in/Programm</translation>
     </message>
@@ -15537,7 +16476,19 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
         <translation>Bitte überprüfe deine Systemuhr.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Prüfe freigegebene Dateien...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Erstelle Prüfsumme</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Speichere Dateiindex...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15548,19 +16499,17 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Unbekannter Titel</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
-        <translation>Verschlüsselte Nachricht</translation>
+        <translation>Verschlüsselte Nachr.</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Damit die Chatlobbys richtig funktionieren, muss auf deinem Computer die richtige Zeit eingestellt sein. Bitte prüfe ob dies der Fall ist. (Es wurde eine mögliche Zeitabweichung von mehreren Minuten gegenüber deinen Freunden festgestellt.)</translation>
     </message>
@@ -15568,7 +16517,7 @@ Mindestens ein Peer wurde nicht zu einer Gruppe hinzugefügt</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Freund Online</translation>
     </message>
@@ -15609,17 +16558,21 @@ Minimalmodus: 10% vom Standarddatenaufkommen und (unfertig) pausiert alle Datei
     <message>
         <location line="+44"/>
         <source>&lt;p&gt;Warning: This Operating mode disables the tunneling service. This means you can use distant chat not anonymously download files and the mail service will be slower.&lt;/p&gt;&lt;p&gt;This state will be saved after restart, so do not forget that you changed it!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Warnung: In diesem Betriebsmodus ist der Tunneldienst deaktiviert. Das bedeutet, dass Sie den Distant-Chat nicht anonym nutzen können und der Mail-Dienst langsamer wird.&lt;/p&gt;&lt;p&gt;Dieser Zustand wird nach dem Neustart gespeichert, vergessen Sie also nicht, dass Sie ihn geändert haben!&lt;/p&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+5"/>
         <source>Turtle routing disabled!</source>
-        <translation>Turtle-Routing deaktiviert!</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Dialog</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15685,6 +16638,10 @@ Minimalmodus: 10% vom Standarddatenaufkommen und (unfertig) pausiert alle Datei
         <source>This profile has signed your own profile key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Schlüsselsignaturen :</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15710,12 +16667,7 @@ p, li { white-space: pre-wrap; }
         <translation>PGP-Schlüssel</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15724,6 +16676,10 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">PGP-Schlüssel unterzeichnen</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15760,7 +16716,12 @@ p, li { white-space: pre-wrap; }
         <translation>Signaturen einschließen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Optionen</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15806,21 +16767,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Fehler: Kann Nachbardetails nicht ermitteln.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Der angegebene Schlüsselalgorithmus wird von RetroShare nicht unterstützt.
@@ -15839,7 +16800,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Das Vertrauensniveau drückt dein eigenes Vertrauen in diesen Schlüssel aus. Es wird weder von der Software genutzt noch geteilt, kann aber zum Merken guter bzw. schlechter Schlüssel nützlich sein.</translation>
     </message>
@@ -15891,12 +16852,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+2"/>
         <source>Identity creation failed</source>
-        <translation type="unfinished">Identitätserstellung fehlgeschlagen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
-        <translation type="unfinished">Ohne Ihr Profilpasswort können Sie keine mit Ihrem Profil verknüpfte Identität erstellen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -15908,6 +16869,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Vielleicht ist das Passwort falsch</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15915,12 +16880,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>RetroShare-Profil</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Dies ist dein eigener PGP-Schlüssel und er wurde signiert von:</translation>
     </message>
@@ -15946,7 +16911,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
@@ -15967,7 +16932,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Element entfernen</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
@@ -15979,7 +16944,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+19"/>
         <source>Trust: </source>
-        <translation>Vertrauen: </translation>
+        <translation>Vertrauen:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -16004,10 +16969,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+20"/>
         <source>Time offset:</source>
-        <translation>Zeitdifferenz:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Nachricht schreiben</translation>
     </message>
@@ -16021,10 +16986,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Freund verbunden</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Verbindungsversuch</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
-        <translation>Verbindung von Peer abgelehnt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -16034,7 +17003,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+3"/>
         <source>Friend Time Offset</source>
-        <translation>Zeitversatz des Freundes</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -16045,7 +17014,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+26"/>
         <location line="+2"/>
         <source>Unknown peer</source>
-        <translation>Unbekannter Peer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-1"/>
@@ -16057,7 +17026,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+1"/>
         <location line="+1"/>
         <source>Unknown</source>
-        <translation>Unbekannt</translation>
+        <translation type="unfinished">Unbekannt</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Unbekannter Nachbar</translation>
     </message>
     <message>
         <location line="+106"/>
@@ -16065,7 +17038,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Nachricht senden</translation>
     </message>
@@ -16100,7 +17073,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+41"/>
         <location line="+69"/>
         <source>Drag your circles or people to each other.</source>
-        <translation>Ziehe deine Kreise oder Leute zueinander.</translation>
+        <translation>Ziehe deine Kreise oder Leute zueinander</translation>
     </message>
     <message>
         <location line="-41"/>
@@ -16117,25 +17090,29 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Chat with this person as...</source>
         <translation>Mit dieser Person chatten als...</translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">Nachricht an diese Person senden</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
-        <translation>Zum Kreis einladen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+45"/>
         <source>Send message</source>
-        <translation>Nachricht senden</translation>
+        <translation type="unfinished">Nachricht senden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Send invite</source>
-        <translation>Einladung senden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Add to Contacts</source>
-        <translation>Zu Kontakte hinzufügen</translation>
+        <translation type="unfinished">Zu Kontakte hinzufügen</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -16173,52 +17150,52 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+6"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Jeder in Ihrer Kontaktliste hat automatisch eine positive Meinung, wenn dies nicht festgelegt ist. Dadurch kann die Reputation verwendeter Knoten automatisch erhöht werden. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
-        <translation>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Automatically add identities owned by friend nodes to my contacts</source>
-        <translation>Füge automatisch Identitäten von Freundesknoten zu meinen Kontakten hinzu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Difference in votes (+/-) to rate an ID negatively:</source>
-        <translation>Unterschied in den Stimmen (+/-), um eine ID negativ zu bewerten:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When an identity receives more negative votes than positive votes, it switches from &amp;quot;Neutral&amp;quot; to &amp;quot;Negative (according to your friends)&amp;quot;. By default, a one-vote difference is enough, but you can make this harder to happen by selecting a higher number here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wenn eine Identität mehr negative als positive Stimmen erhält, wechselt sie von „Neutral“ zu „Neutral“. zu „Negativ (laut deinen Freunden)“. Standardmäßig reicht ein Unterschied von einer Stimme aus, aber Sie können dies erschweren, indem Sie hier eine höhere Zahl auswählen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When an identity receives more positive votes than negative votes, it switches from &amp;quot;Neutral&amp;quot; to &amp;quot;Positive (according to your friends)&amp;quot;. By default, a one-vote difference is enough, but you can make this harder to happen by selecting a higher number here.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wenn eine Identität mehr positive als negative Stimmen erhält, wechselt sie von „Neutral“ zu „Neutral“. zu „Positiv (laut deinen Freunden)“. Standardmäßig reicht ein Unterschied von einer Stimme aus, aber Sie können dies erschweren, indem Sie hier eine höhere Zahl auswählen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Difference in votes (+/-) to rate an ID positively:</source>
-        <translation>Differenz in den Stimmen (+/-), um eine ID positiv zu bewerten:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Delete banned identities after (0 means indefinitely):</source>
-        <translation>Gesperrte Identitäten löschen nach (0 bedeutet auf unbestimmte Zeit):</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Reset reputation of banned identities after (0 means never):</source>
-        <translation>Reputation gesperrter Identitäten zurücksetzen nach (0 bedeutet nie):</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Banned identities are not stamped and therefore lose activity. They get deleted automatically after a finit period of time.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gesperrte Identitäten werden nicht gestempelt und verlieren daher ihre Aktivität. Sie werden nach einer bestimmten Zeitspanne automatisch gelöscht.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -16229,7 +17206,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="-3"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;In order to prevent deleted banned IDs to come back because they are used in e.g. forums or channels, banned identities are kept in a list for some time. After that, they are &amp;quot;cleared&amp;quot; from the banning list, and will be downloaded again as unbanned if used in forus, chat rooms, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Um zu verhindern, dass gelöschte gesperrte IDs zurückkommen, weil sie z. B. in In Foren oder Kanälen werden gesperrte Identitäten für einige Zeit in einer Liste gespeichert. Danach werden sie „gelöscht“. aus der Sperrliste entfernt und bei Verwendung in Foren, Chatrooms usw. erneut als nicht gesperrt heruntergeladen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formular</translation>
     </message>
 </context>
 <context>
@@ -16239,45 +17223,57 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Foto</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Zusammenfassung</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
-        <translation>Album-/Fotoname</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+99"/>
         <source>Details</source>
-        <translation>Details</translation>
+        <translation type="unfinished">Details</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>50 %</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>75 %</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>100 %</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>200 %</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Comments</source>
-        <translation>Kommentare</translation>
+        <translation type="unfinished">Kommentare</translation>
     </message>
     <message>
         <location line="+42"/>
@@ -16292,22 +17288,30 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     <message>
         <location line="+33"/>
         <source>Photo Title:</source>
-        <translation>Fototitel:</translation>
+        <translation>Fototitel</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>When</source>
-        <translation>Wann</translation>
+        <translation>Wann:</translation>
     </message>
     <message>
         <location line="-151"/>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Kommentar hinzufügen</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Schreibe einen Kommentar...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
-        <translation>Album</translation>
+        <translation type="unfinished">Album</translation>
     </message>
 </context>
 <context>
@@ -16374,6 +17378,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Album erstellen</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Album ansehen</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16395,17 +17403,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diaschau</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Eigene Alben</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Abonnierte Alben</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Freigegebene Alben</translation>
     </message>
@@ -16435,7 +17443,7 @@ kannst musst du eines auswählen!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Albumname</translation>
     </message>
@@ -16491,44 +17499,44 @@ kannst musst du eines auswählen!</translation>
     <message>
         <location filename="../gui/Posted/PhotoView.ui" line="+14"/>
         <source>Photo View</source>
-        <translation>Fotoansicht</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
-        <translation>Gepostet von</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
-        <translation>vor</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Copy RetroShare link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Share</source>
-        <translation>Verteilen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/Posted/PhotoView.cpp" line="+101"/>
         <source>information</source>
-        <translation>Informationen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
-        <translation>Der Retrohare-Link wurde in Ihre Zwischenablage kopiert.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -16542,12 +17550,12 @@ kannst musst du eines auswählen!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Mehr Details über dieses Plug-in anzeigen</translation>
     </message>
@@ -16602,7 +17610,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+24"/>
         <source>File name: </source>
-        <translation>Dateiname: </translation>
+        <translation>Dateiname:</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -16612,7 +17620,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+23"/>
         <source>Status: </source>
-        <translation>Status: </translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="../gui/settings/PluginItem.cpp" line="+37"/>
@@ -16630,22 +17638,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+141"/>
         <source>Error: instance &apos;%1&apos; can&apos;t create a widget</source>
-        <translation>Fehler: Instanz „%1“ kann kein Widget erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+83"/>
         <source>Error: failed to remove file %1 (uninstalling plugin &apos;%2&apos;)</source>
-        <translation>Fehler: Datei %1 konnte nicht entfernt werden (Plugin „%2“ wird deinstalliert)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Error (uninstall): no plugin with name &apos;%1&apos; found</source>
-        <translation>Fehler (Deinstallation): Kein Plugin mit dem Namen „%1“ gefunden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Error (installation): plugin file %1 doesn&apos;t exist</source>
-        <translation>Fehler (Installation): Plugin-Datei %1 existiert nicht</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-98"/>
@@ -16693,6 +17701,51 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Plug-in Ordner</translation>
     </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[deaktivert]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Keine API-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[Ladeproblem]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Keine SVN-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Fehler beim Laden.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Fehlendes Symbol. Falsche Version?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Kein Plug-in Objekt</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Plug-in ist geladen.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Unbekannter Status.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Lies dies, um über die Plug-in-Entwicklung zu erfahren. Ihre Prüfsumme wird nicht überprüft, normalerweise
+schützt dich aber eine Überprüfung des Prüfsumme vor
+schädlichem Verhalten von Plug-ins.</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16762,30 +17815,15 @@ p, li { white-space: pre-wrap; }
         <translation>Immer im Vordergrund</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation>Diese Person verbannen (setzt negative Meinung)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation>Neutrale Meinung abgeben</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation>Positive Meinung abgeben</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
-        <translation>Wählen Sie die Fensterfarbe...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
-        <translation>Fenster andocken</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -16793,28 +17831,36 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="+118"/>
         <source>Remote status unknown.</source>
-        <translation>Remote-Status unbekannt.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Can&apos;t send message immediately, because there is no tunnel available.</source>
-        <translation>Kann die Nachricht nicht sofort senden, da kein Tunnel verfügbar ist.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <location line="+1"/>
         <source>Your partner closed the conversation.</source>
-        <translation>Ihr Partner hat das Gespräch beendet.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Closing this window will end the conversation. Unsent messages will be dropped.</source>
-        <translation>Wenn Sie dieses Fenster schließen, wird die Konversation beendet. Nicht gesendete Nachrichten werden verworfen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Close conversation?</source>
-        <translation>Gespräch beenden?</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Das Schließen dieses Fensters beendet die Unterhaltung, benachrichtigt den Gesprächspartner und löscht den verschlüsselten Tunnel.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Tunnel schließen?</translation>
     </message>
 </context>
 <context>
@@ -16822,105 +17868,113 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/Posted/PostedCardView.ui" line="+146"/>
         <source>Posted by</source>
-        <translation>Gepostet von</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+48"/>
         <source>Toggle Message Read Status</source>
-        <translation>Lesestatus der Nachricht umschalten</translation>
+        <translation type="unfinished">Lesestatus der Nachricht umschalten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="unfinished">Neu</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
-        <translation>Daumen hoch</translation>
+        <translation type="unfinished">Daumen hoch</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>0</source>
-        <translation>0</translation>
+        <translation type="unfinished">0</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Vote down</source>
-        <translation>Daumen runter</translation>
+        <translation type="unfinished">Daumen runter</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>\/</source>
-        <translation>\/</translation>
+        <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
-        <translation>Kommentare</translation>
+        <translation type="unfinished">Kommentare</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Share</source>
-        <translation>Verteilen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Set as read and remove item</source>
-        <translation>Als gelesen markieren und Eintrag entfernen</translation>
+        <translation type="unfinished">Als gelesen markieren und Eintrag entfernen</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Remove Item</source>
-        <translation>Eintrag entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+44"/>
         <source>PictureLabel</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
-        <translation>Kommentar</translation>
+        <translation type="unfinished">Kommentar</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
-        <translation>Kommentare </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+67"/>
         <source>Loading</source>
-        <translation>Lade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show author in people tab</source>
-        <translation>Autor auf der Registerkarte Personen anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+39"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
-        <translation>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Der Autor dieser Nachricht (mit der ID %1) ist gesperrt.&lt;/b&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
-        <source>Create a new Post</source>
-        <translation>Neuen Beitrag erstellen</translation>
+        <source>Signed by: </source>
+        <translation type="vanished">Unterzeichnet von:</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <source>Notes</source>
+        <translation type="vanished">Notizen</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
+        <source>Create a new Post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16932,124 +17986,110 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+26"/>
         <source>Message is too large.&lt;br /&gt;actual size: %1 bytes, maximum size: %2 bytes.</source>
-        <translation>Nachricht ist zu groß.&lt;br /&gt;Aktuelle Größe: %1 Bytes, maximale Größe: %2 Bytes.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation>Fehler beim Erstellen eines Beitrags</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation>Beim Erstellen des Beitrags ist ein Fehler aufgetreten.</translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
-        <translation>Bilddatei laden</translation>
+        <translation type="unfinished">Bilddatei laden</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
-        <translation>Bild posten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Do you want to share and link the original image?</source>
-        <translation>Möchten Sie das Originalbild teilen und verlinken?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>You already added a link.&lt;br /&gt;Do you want to replace it?</source>
-        <translation>Sie haben bereits einen Link hinzugefügt.&lt;br /&gt;Möchten Sie ihn ersetzen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation>Kein Bild in der Zwischenablage gefunden.</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation>In der Zwischenablage befinden sich keine Bilddaten zum Einfügen</translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
-        <translation>Dieses Fenster schließen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Do you really want to discard your post?</source>
-        <translation>Wollen Sie Ihren Beitrag wirklich verwerfen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Beitrag einreichen</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">Du reichst einen Link ein. Der Schlüssel für einen erfolgreichen Beitrag ist interessanter Inhalt und eine passende Überschrift.</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Einreichen</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Einen neuen Beitrag einreichen</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Bitte füge einen Titel hinzu</translation>
     </message>
     <message>
         <location filename="../gui/Posted/PostedCreatePostDialog.ui" line="+14"/>
         <source>Create a Post</source>
-        <translation>Beitrag erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+91"/>
         <source>Preview</source>
-        <translation>Vorschau</translation>
+        <translation type="unfinished">Vorschau</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Add Picture</source>
-        <translation>Bild hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
-        <translation>Die Größe der Beiträge ist auf 32 KB begrenzt, die Bilder werden verkleinert.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation>Bild aus Zwischenablage einfügen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation>Bild einfügen</translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
-        <translation>Bild entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+69"/>
         <source>Url</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Post as</source>
-        <translation>Veröffentlichen als</translation>
+        <translation type="unfinished">Veröffentlichen als</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
-        <translation>Posten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Image</source>
-        <translation>Bild</translation>
+        <translation type="unfinished">Bild</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
-        <translation>Sie reichen einen Beitrag ein. Der Schlüssel zu einem erfolgreichen Beitrag ist ein interessanter Inhalt und ein beschreibender Titel.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+40"/>
@@ -17057,7 +18097,7 @@ p, li { white-space: pre-wrap; }
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Link</translation>
     </message>
@@ -17065,48 +18105,96 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Veröffentlichte Links</translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Thema erstellen</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Eigene Themen</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Abonnierte Themen</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Beliebte Themen</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Andere Themen</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Create Board</source>
-        <translation>Board erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>My Boards</source>
-        <translation>Meine Boards</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Subscribed Boards</source>
-        <translation>Abbonnierte Boards</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Popular Boards</source>
-        <translation>Populäre Boards</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Other Boards</source>
-        <translation>Andere Boards</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Posted-Thema</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Thema-Aministratoren hinzufügen</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Themenverwalter auswählen</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Neues Thema erstellen</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Thema bearbeiten</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Thema aktualisieren</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
-        <translation>Neues Board erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -17121,54 +18209,44 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Edit Board</source>
-        <translation>Board bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update Board</source>
-        <translation>Board aktuallisieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Board Admins</source>
-        <translation>Board-Admins hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select Board Admins</source>
-        <translation>Board-Admins auswählen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation>Letzte Aktivität</translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>Posted abonnieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Subscribe</source>
-        <translation>Abonnieren</translation>
+        <translation type="unfinished">Abonnieren</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -17180,22 +18258,29 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+33"/>
         <source>Board Description</source>
-        <translation>Board Beschreibung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">Posted Beschreibung</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Lade</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">Neues Posted</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
-        <translation>Lade...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation>Nie</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
-        <translation>Neuer Board</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+30"/>
@@ -17206,64 +18291,72 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Site</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Kommentare</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show author in people tab</source>
-        <translation>Autor auf der Registerkarte Personen anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
-        <translation>Kommentare </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+18"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
-        <translation>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Der Autor dieser Mitteilung (mit ID %1) ist gesperrt.&lt;/b&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
-        <translation>Zum Betrachten des Bildes anklicken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+147"/>
         <source>Hide</source>
-        <translation>Verbergen</translation>
+        <translation type="unfinished">Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Daumen hoch</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Daumen runter</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Als gelesen markieren und Eintrag entfernen</translation>
     </message>
@@ -17273,7 +18366,7 @@ p, li { white-space: pre-wrap; }
         <translation>Neu</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Neuer Kommentar:</translation>
     </message>
@@ -17283,20 +18376,20 @@ p, li { white-space: pre-wrap; }
         <translation>Kommentarwert</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Posted by</source>
-        <translation>Gepostet von</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+87"/>
         <location filename="../gui/Posted/PostedItem.cpp" line="+6"/>
         <source>Expand</source>
-        <translation>Erweitern</translation>
+        <translation type="unfinished">Erweitern</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -17306,12 +18399,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+56"/>
         <source>Share</source>
-        <translation>Teilen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Notes</source>
-        <translation>Notizen</translation>
+        <translation type="unfinished">Notizen</translation>
     </message>
     <message>
         <location line="+50"/>
@@ -17321,322 +18414,360 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+49"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Lade</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Von</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formular</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Heiß</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Neu</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Anfang</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Heute</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Gestern</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">diese Woche</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">diesen Monat</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">dieses Jahr</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Einen neuen Beitrag einreichen</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Nächstes</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Vor dem Abstimmen bitte eine Signier-ID erstellen oder auswählen</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Vorherige</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
         <location filename="../gui/Posted/PostedListWidgetWithModel.ui" line="+14"/>
         <source>Form</source>
-        <translation>Formular</translation>
+        <translation type="unfinished">Formular</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Details</source>
-        <translation>Details</translation>
+        <translation type="unfinished">Details</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Board Details</source>
-        <translation>Board Details</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximale Anzahl von Datenelementen (einschließlich Beiträgen, Kommentaren, Abstimmungen) über Freundschaftsknoten hinweg.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation>Artikel (bei Freunden):</translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
-        <translation>0</translation>
+        <translation type="unfinished">0</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Administrator:</source>
-        <translation>Administrator:</translation>
+        <translation type="unfinished">Administrator:</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
-        <translation>unbekannt</translation>
+        <translation type="unfinished">unbekannt</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
-        <translation>Verteilung:</translation>
+        <translation type="unfinished">Verteilung:</translation>
     </message>
     <message>
         <location line="-39"/>
         <source>Last activity:</source>
-        <translation>Letzte Aktivität:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
-        <translation>Erstellt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
-        <translation>Popularität:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
-        <translation>Sync-Zeitraum:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation>Anzahl der abonnierten Freundesknoten</translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
-        <translation>Beiträge</translation>
+        <translation type="unfinished">Beiträge</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
-        <translation>Beitrag erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot;font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI-Symbol&apos;; Schriftgröße: 14pt; Farbe: #24292e; Hintergrundfarbe: #ffffff;&quot;&gt;Sortierung auswählen&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="unfinished">Neu</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Top</source>
-        <translation>Top</translation>
+        <translation type="unfinished">Anfang</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Hot</source>
-        <translation>Heiß</translation>
+        <translation type="unfinished">Heiß</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="unfinished">Suchen</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Classic view</source>
-        <translation>Klassische Ansicht</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Previous</source>
-        <translation>Vorherige</translation>
+        <translation type="unfinished">Vorherige</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>1-10</source>
-        <translation>1-10</translation>
+        <translation type="unfinished">1-10</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Next</source>
-        <translation>Nächstes</translation>
+        <translation type="unfinished">Nächstes</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Default identity used when voting&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Standard-Identität, die bei der Abstimmung verwendet wird&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
-        <translation>Keine Dateien in diesem Beitrag, oder kein Beitrag ausgewählt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
-        <translation>Keine Beiträge in diesem Board vorhanden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
-        <translation>Klicken, um zur Kartenansicht zu wechseln</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Click to switch to compact view</source>
-        <translation>Klicken, um zur Kompaktansicht zu wechseln</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+31"/>
         <source>Empty</source>
-        <translation>Leer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
-        <translation>RetroShare-Link kopieren</translation>
+        <translation type="unfinished">RetroShare-Link kopieren</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation>http-Link kopieren</translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
-        <translation>Autor auf der Registerkarte Personen anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Edit</source>
-        <translation>Bearbeiten</translation>
+        <translation type="unfinished">Bearbeiten</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
-        <translation>Informationen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
-        <translation>Der Retrohare-Link wurde in Ihre Zwischenablage kopiert.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
-        <translation>Fehler bei der Link-Erstellung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
-        <translation>Link konnte nicht erstellt werden: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
-        <translation>[Kein Name]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Subscribed</source>
-        <translation>Abonniert</translation>
+        <translation type="unfinished">Abonniert</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Subscribe</source>
-        <translation>Abonnieren</translation>
+        <translation type="unfinished">Abonnieren</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
-        <translation>Nie</translation>
+        <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>5 days</source>
-        <translation>5 Tage</translation>
+        <translation type="unfinished">5 Tage</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>2 weeks</source>
-        <translation>2 Wochen</translation>
+        <translation type="unfinished">2 Wochen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1 month</source>
-        <translation>1 Monat</translation>
+        <translation type="unfinished">1 Monat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>3 months</source>
-        <translation>3 Monate</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>6 months</source>
-        <translation>6 Monate</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>1 year</source>
-        <translation>1 Jahr</translation>
+        <translation type="unfinished">1 Jahr</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>indefinitly</source>
-        <translation>Unbegrenzt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Unknown</source>
-        <translation>Unbekannt</translation>
+        <translation type="unfinished">Unbekannt</translation>
     </message>
     <message>
         <location line="+32"/>
         <source>Public</source>
-        <translation>Öffentlich</translation>
+        <translation type="unfinished">Öffentlich</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation>Beschränkt auf Mitglieder des Kreises &quot;</translation>
+        <translation type="unfinished">Beschränkt auf Mitglieder des Kreises &quot;</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation>Beschränkt auf Mitglieder des Kreises </translation>
+        <translation type="unfinished">Beschränkt auf Mitglieder des Kreises </translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your eyes only</source>
-        <translation>Nur für Ihre Augen</translation>
+        <translation type="unfinished">Nur Ihre Augen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>You and your friend nodes</source>
-        <translation>Sie und Ihr Freund Knotenpunkte</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+181"/>
         <source>No Channel Selected</source>
-        <translation>Keinen Kanal gewählt</translation>
-    </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation>Konnte nicht abstimmen</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation>Bei der Abstimmung ist ein Fehler aufgetreten: </translation>
+        <translation type="unfinished">Keinen Kanal gewählt</translation>
     </message>
 </context>
 <context>
@@ -17646,38 +18777,46 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Jedes Thema in einem neuen Reiter öffnen.</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
-        <translation>Öffnen Sie jedes Board in einem neuen Tab</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/settings/PostedPage.h" line="+43"/>
         <source>Boards</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Posted</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
-        <translation>Board Beitrag</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+18"/>
         <source>You have %1 new board posts</source>
-        <translation>Sie haben %1 neue Beiträge im Board</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 new board post</source>
-        <translation>Sie haben %1 neuen Board Beitrag</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 new board post</source>
-        <translation>%1 neuer Beitrag im Board</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -17727,16 +18866,16 @@ p, li { white-space: pre-wrap; }
         <translation>Profil-Manager</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17848,7 +18987,7 @@ und den Import zum Laden verwenden</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Statusnachricht ändern</translation>
@@ -17864,7 +19003,7 @@ und den Import zum Laden verwenden</translation>
         <translation>Profil-Manager</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Öffentliche Information</translation>
     </message>
@@ -17899,12 +19038,12 @@ und den Import zum Laden verwenden</translation>
         <translation>Online seit:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Andere Informationen</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Meine Adresse</translation>
     </message>
@@ -17942,48 +19081,72 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+10"/>
         <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
-        <translation>Dein Zertifikat ist in die Zwischenablage kopiert worden. Du kannst es per E-Mail oder auf andere Weise an deinen Freund senden</translation>
+        <translation>Dein Zertifikat ist in die Zwischenablage kopiert worden. Du kannst es per E-Mail oder auf andere Weise an deinen Freund senden.</translation>
     </message>
 </context>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Beitrag von:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Konto 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Konto 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Konto 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Zu Puls hinzufügen</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">filtern</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">URL-Hinzufüger</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Anzeigen als</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
         <source>From:</source>
-        <translation>Von:</translation>
+        <translation type="unfinished">Von:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18000,26 +19163,26 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+5"/>
         <source>Positive</source>
-        <translation>Positiv</translation>
+        <translation type="unfinished">Positiv</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Neutral</source>
-        <translation>Neutral</translation>
+        <translation type="unfinished">Neutral</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Negative</source>
-        <translation>Negativ</translation>
+        <translation type="unfinished">Negativ</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
-        <translation>Was geschieht?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18028,27 +19191,17 @@ und den Import zum Laden verwenden</translation>
         <location line="+4"/>
         <location line="+4"/>
         <source>Drag and Drop Image</source>
-        <translation>Drag and Drop Bild</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation>Entfernen Sie alle Bilder</translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation>Bild hinzufügen</translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
-        <translation>Posten </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -18056,14 +19209,18 @@ und den Import zum Laden verwenden</translation>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
-        <source>Post</source>
-        <translation>Posten</translation>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Puls an Wire senden</translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
+        <source>Post</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
-        <translation>Antworten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -18073,27 +19230,37 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+9"/>
         <source>Republish Pulse</source>
-        <translation>Neu veröffentlichen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
-        <translation>Bilder ausblenden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
-        <translation>Bilder hinzufügen</translation>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PulseItem</name>
+    <message>
+        <source>From</source>
+        <translation type="vanished">Von</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation>Bilddatei laden</translation>
+        <source>Date</source>
+        <translation type="vanished">Datum</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">…</translation>
     </message>
 </context>
 <context>
@@ -18101,15 +19268,15 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location filename="../gui/TheWire/PulseMessage.ui" line="+14"/>
         <source>Form</source>
-        <translation>Formular</translation>
+        <translation type="unfinished">Formular</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
         <source>Click to view picture</source>
-        <translation>Zum Betrachten des Bildes anklicken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-54"/>
@@ -18117,13 +19284,13 @@ und den Import zum Laden verwenden</translation>
         <location line="+19"/>
         <location line="+19"/>
         <source>Image</source>
-        <translation>Bild</translation>
+        <translation type="unfinished">Bild</translation>
     </message>
 </context>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18133,9 +19300,9 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
-        <translation>Antworten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -18147,7 +19314,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="-71"/>
         <source>REPUBLISH</source>
-        <translation>REPUBLIKIEREN</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+54"/>
@@ -18157,12 +19324,12 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+54"/>
         <source>SHOW</source>
-        <translation>Zeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
-        <translation>Folgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -18170,7 +19337,7 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18190,7 +19357,7 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18220,7 +19387,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+3"/>
         <source>...</source>
-        <translation type="unfinished">...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+79"/>
@@ -18281,7 +19448,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+78"/>
         <source>REPLY</source>
-        <translation>Antworten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -18293,7 +19460,7 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="-71"/>
         <source>REPUBLISH</source>
-        <translation>REPUBLIKIEREN</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+54"/>
@@ -18303,53 +19470,48 @@ und den Import zum Laden verwenden</translation>
     <message>
         <location line="+54"/>
         <source>SHOW</source>
-        <translation>Anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
-        <translation>Folgen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
-        <translation>Standort</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation>Profil editieren</translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18381,16 +19543,16 @@ und den Import zum Laden verwenden</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
-        <translation>Folgen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Bestätigung</translation>
     </message>
@@ -18411,32 +19573,32 @@ hinzufügen und den Assistent zum Hinzufügen von Freunden zu starten.
     <message>
         <location line="+733"/>
         <source>Warning: Retroshare is about to ask your system to open this file. </source>
-        <translation>Warnung: Retroshare fordert Ihr System auf, diese Datei zu öffnen. </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Before you do so, please make sure that this file does not contain malicious executable code.</source>
-        <translation>Bevor Sie dies tun, stellen Sie bitte sicher, dass diese Datei keinen schädlichen ausführbaren Code enthält.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+78"/>
         <source>Identity added to People</source>
-        <translation>Identität zu Personen hinzugefügt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The identity was added to people. You can now chat with it, send messages to it, etc.</source>
-        <translation>Die Identität wurde zu Personen hinzugefügt. Sie können jetzt mit ihm chatten, Nachrichten an ihn senden usw.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Identity cannot be added to People</source>
-        <translation>Identität kann nicht zu Personen hinzugefügt werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>The identity was not added to people. Some error occured. The link is probably corrupted.</source>
-        <translation>Die Identität war nicht an Personen gebunden. Es ist ein Fehler aufgetreten. Der Link ist wahrscheinlich beschädigt.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+85"/>
@@ -18551,17 +19713,17 @@ hinzufügen und den Assistent zum Hinzufügen von Freunden zu starten.
     <message>
         <location line="+17"/>
         <source>Posted not found</source>
-        <translation>Die gepostete Nachricht wurde nicht gefunden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Posted message not found</source>
-        <translation>Die gepostete Nachricht wurde nicht gefunden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Posted messages not found</source>
-        <translation>Gepostete Nachrichten wurden nicht gefunden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
@@ -18571,22 +19733,22 @@ hinzufügen und den Assistent zum Hinzufügen von Freunden zu starten.
     <message>
         <location line="-932"/>
         <source>Click to browse/download this file collection</source>
-        <translation>Klickenr, um diese Dateisammlung zu durchsuchen/herunterzuladen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+163"/>
         <source>%1 (%2)</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Identity link (name=%1, ID=%2)</source>
-        <translation>Identitätslink (Name=%1, ID=%2)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1 (%2 files, %3)</source>
-        <translation>%1 (%2 Dateien, %3)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+743"/>
@@ -18606,7 +19768,7 @@ hinzufügen und den Assistent zum Hinzufügen von Freunden zu starten.
     <message>
         <location line="+17"/>
         <source>Chat room not found</source>
-        <translation>Chatraum nicht gefunden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -18661,12 +19823,12 @@ Die Zeichen &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; werden durch &
         <translation>Nachbardetails</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Dateianforderung abgebrochen</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Diese Version von RetroShare benutzt das OpenPGP-SDK. Der Schlüsselring des Systems wird nicht mehr verwendet, sondern ein eigener Schlüsselring für alle laufenden Instanzen.&lt;br&gt;&lt;br&gt;Du scheinst keinen solchen Schlüsselring zu besitzen, obwohl Schlüssel von existierenden RetroShare-Accounts benötigt werden. Vielleicht hast du auch gerade zu dieser Version gewechselt.</translation>
     </message>
@@ -18697,45 +19859,41 @@ Die Zeichen &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; werden durch &
         <translation>Ein unerwarteter Fehler ist aufgetreten. Bitte melde &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
-        <translation>Tor Manager kann nicht gestartet werden!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Tor cannot be started on your system: 
 
 </source>
-        <translation>Tor kann auf deinem System nicht gestartet werden:
-
-</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Cannot start Tor</source>
-        <translation>Tor kann nicht gestartet werden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Sorry but Tor cannot be started on your system!
 
 The error reported is:&quot;</source>
-        <translation>Tor kann auf deinem System leider nicht gestartet werden!
-
-Die Fehlermeldung lautet:&quot;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Cannot start a hidden tor service!</source>
-        <translation>Kann einen hidden Tor service nicht starten!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>It was not possible to start a hidden service.</source>
-        <translation>Es war nicht möglich, einen hidden service zu starten.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Mehrere Instanzen</translation>
@@ -18754,29 +19912,7 @@ Lockdatei:
         <source>An unexpected error occurred when Retroshare tried to acquire the single instance lock
  Lock file:
 </source>
-        <translation>Ein ist ein unerwarteter Fehler während des &quot;Single instance lock&quot; aufgetreten
-Lock datei:
-</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation>Altes Zertifikat</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation>Dieser Knoten verwendet alte Zertifikatseinstellungen, die von Ihrer aktuellen OpenSSL-Bibliotheksversion als zu schwach angesehen wird. Sie müssen einen neuen Knoten erstellen, der möglicherweise das gleiche Profil verwendet.</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation>Tor-Fehler</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation>Tor kann nicht ausgeführt/konfiguriert werden. Stellen Sie sicher, dass es auf Ihrem System installiert ist.</translation>
+        <translation>Ein unerwarteter Fehler während des &quot;Single instance lock&quot; ist aufgetreten</translation>
     </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
@@ -18786,17 +19922,17 @@ Lock datei:
     <message>
         <location line="+11"/>
         <source>Tunnel is pending</source>
-        <translation>Tunnel ist in Vorbereitung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>(some undelivered messages)</source>
-        <translation>(einige unzustellbare Nachrichten)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>End-to-end encrypted conversation established</source>
-        <translation>Ende-zu-Ende-verschlüsselte Konversation aufgebaut</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
@@ -18860,7 +19996,7 @@ Der gemeldete Fehler ist:
         <translation>Daten weiter</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Du scheinst Netzknoten zu besitzen, die mit DSA-Schlüsseln verknüpft sind:</translation>
     </message>
@@ -18870,7 +20006,7 @@ Der gemeldete Fehler ist:
         <translation>DSA-Schlüssel werden von dieser Version von RetroShare noch nicht unterstützt. Alle diese Netzknoten können nicht benutzt werden. Das tut uns sehr leid.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>aktiviert</translation>
     </message>
@@ -18880,7 +20016,7 @@ Der gemeldete Fehler ist:
         <translation>deaktivert</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>IP %1 in Whitelist verschieben</translation>
     </message>
@@ -18896,7 +20032,7 @@ Der gemeldete Fehler ist:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>Vor %1 Sekunden</translation>
     </message>
@@ -18964,9 +20100,9 @@ Security: no anonymous IDs</source>
 Sicherheit: keine anonymen Kennungen</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
-        <translation>Treten Sie dem Chatroom bei</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/RetroShareLink.cpp" line="-201"/>
@@ -18989,12 +20125,12 @@ Sicherheit: keine anonymen Kennungen</translation>
         <location line="+1"/>
         <location filename="../gui/common/NewFriendList.cpp" line="+1"/>
         <source>unable to parse XML file!</source>
-        <translation>XML-Datei kann nicht geparst werden!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
-        <translation>Unbestimmt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19034,214 +20170,198 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="-101"/>
         <source>Processing</source>
-        <translation>Verarbeitung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Choosing group</source>
-        <translation>Gruppe auswählen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creating receipt</source>
-        <translation>Quittung erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Signing receipt</source>
-        <translation>Quittung unterschreiben</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Serializing</source>
-        <translation>Serialisierung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Creating payload</source>
-        <translation>Payload erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Encrypting payload</source>
-        <translation>Verschlüsselung der Nutzlast</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Publishing</source>
-        <translation>Veröffentlichung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Waiting for receipt</source>
-        <translation>Warte auf die Quittung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Receipt received</source>
-        <translation>Quittung erhalten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Receipt signature failed</source>
-        <translation>Die Signatur der Quittung ist fehlgeschlagen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Encryption failed</source>
-        <translation>Die Verschlüsselung ist fehlgeschlagen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/statistics/GxsIdStatistics.cpp" line="-418"/>
         <source>Discovery</source>
-        <translation>Discovery</translation>
+        <translation type="unfinished">Discovery</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Chat</source>
-        <translation>Chat</translation>
+        <translation type="unfinished">Chat</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Messages</source>
-        <translation>Nachrichten</translation>
+        <translation type="unfinished">Nachrichten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Turtle</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heartbeat</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File transfer</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Global router</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File database</source>
-        <translation>Datei-Datenbank</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Service info</source>
-        <translation>Serviceinformationen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Bandwidth control</source>
-        <translation>Bandbreitenkontrolle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+1"/>
         <source>Mail</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Distant mail</source>
-        <translation>Distant-Mail</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Service control</source>
-        <translation>Servicekontrolle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Distant chat</source>
-        <translation>Distant-Chat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS Tunnel</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Ban list</source>
-        <translation>Bannliste</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation>Name</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation>Knoten</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
-        <translation>Status</translation>
+        <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Identities</source>
-        <translation>Identitäten</translation>
+        <translation type="unfinished">Identitäten</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS Photo</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS Wiki</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>GXS TheWire</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Forums</source>
-        <translation>Foren</translation>
+        <translation type="unfinished">Foren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Boards</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Channels</source>
-        <translation>Kanäle</translation>
+        <translation type="unfinished">Kanäle</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Circles</source>
-        <translation>Kreise</translation>
+        <translation type="unfinished">Kreise</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Reputation</source>
-        <translation>Reputation</translation>
+        <translation type="unfinished">Reputation</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19251,12 +20371,12 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>GXS Transport</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>JSon API</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -19270,184 +20390,176 @@ Sicherheit: keine anonymen Kennungen</translation>
     <message>
         <location line="+1"/>
         <source>Group admin signature creation</source>
-        <translation>Erstellung der Gruppenadministratorsignatur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Group admin signature validation</source>
-        <translation>Validierung der Gruppenadministratorsignatur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Group author signature creation</source>
-        <translation>Erstellung der Gruppenautorsignatur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Group author signature validation</source>
-        <translation>Validierung der Signatur des Gruppenautors</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Message author signature creation</source>
-        <translation>Erstellung der Signatur des Nachrichtenautors</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Message author signature validation</source>
-        <translation>Validierung der Signatur des Nachrichtenautors</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Routine group author signature check.</source>
-        <translation>Routinemäßige Überprüfung der Gruppenautorensignatur.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Routine message author signature check</source>
-        <translation>Routinemäßige Überprüfung der Signatur des Nachrichtenautors</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Chat room signature validation</source>
-        <translation>Validierung der Chatroom-Signatur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Global router message validation</source>
-        <translation>Globale Router-Nachrichtenvalidierung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Global router message creation</source>
-        <translation>Erstellung globaler Router-Nachrichten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>DH Key exchange validation for GXS tunnel</source>
-        <translation>DH-Schlüsselaustauschvalidierung für GXS-Tunnel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>DH Key exchange creation for GXS tunnel</source>
-        <translation>Erstellung des DH-Schlüsselaustauschs für den GXS-Tunnel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New identity from GXS sync</source>
-        <translation>Neue Identität durch GXS-Synchronisierung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New friend identity from discovery</source>
-        <translation>Neue Freundesidentität durch Entdeckung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>New identity requested from friend node</source>
-        <translation>Neue Identität vom Freundesknoten angefordert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic signature validation</source>
-        <translation>Generische Signaturvalidierung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic signature creation</source>
-        <translation>Generische Signaturerstellung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic data decryption</source>
-        <translation>Generische Datenentschlüsselung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Generic data encryption</source>
-        <translation>Generische Datenverschlüsselung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Circle membership checking</source>
-        <translation>Überprüfung der Mitgliedschaft im Kreis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/statusbar/hashingstatus.cpp" line="+25"/>
         <source>Click to pause the hashing process</source>
-        <translation>Klicken, um den Hashing-Vorgang anzuhalten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+24"/>
         <source>[Hashing is paused]</source>
-        <translation>[Hashing ist pausiert]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to resume the hashing process</source>
-        <translation>Klicken, um den Hashing-Vorgang fortzusetzen</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Dieses Zertifikat enthält:</translation>
     </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
-        <translation>Untätig</translation>
+        <translation type="unfinished">Untätig</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Virtual peers available</source>
-        <translation>Virtuelle Peers verfügbar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Passive</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Active</source>
-        <translation>Aktiv</translation>
+        <translation type="unfinished">Aktiv</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Requesting peers</source>
-        <translation>Peers angefordert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Never</source>
-        <translation>Nie</translation>
+        <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Tunnel OK</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Tunnel active</source>
-        <translation>Tunnel aktiv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Client</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Server</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation>Fehlender Kanalbeitrag</translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -19612,7 +20724,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Netzwerkweit</translation>
     </message>
@@ -19644,7 +20756,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+6"/>
         <source>Where do you want to have the buttons for the page?</source>
-        <translation>Wo möchten Sie die Schaltflächen für die Seite haben?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -19795,7 +20907,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Das Laden eingebetteter Bilder ist blockiert.</translation>
     </message>
@@ -19808,7 +20920,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Standardmäßig erlaubt</translation>
     </message>
@@ -19845,72 +20957,72 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+176"/>
         <source>Location info exchange between friends. Helps to find actual address in case of dynamic IPs&lt;br&gt;Without it you will have to rely on DHT only for getting fresh addresses</source>
-        <translation>Austausch von Standortinformationen zwischen Freunden. Hilft beim Ermitteln der aktuellen Adresse im Falle von dynamischen IPs&lt;br&gt; Ohne sie sind Sie nur auf DHT angewiesen, um an die neue Adressen zu kommen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Used by direct F2F chat, distant chat and chat lobbies</source>
-        <translation>Wird von direkten F2F-Chats, Distanzchats und Chat-Lobbys verwendet</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Mailing service. Also required for direct f2f chat</source>
-        <translation>Mailing-Dienst. Auch für direkten f2f-Chat erforderlich</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Anonymous routing. Used by file transfers and file search,&lt;br&gt; distant chat, distant mail and distant channels/etc sync</source>
-        <translation>Anonymous routing. Verwendet für Dateiübertragungen und Dateisuche,,&lt;br&gt; Distanz-Chat, Distanz-Mail und Distanz-Kanäle/etc-Synchronisation</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Checks if peers alive</source>
-        <translation>Prüft, ob Peers aktiv sind</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File transfer. If you kill it - you won&apos;t be able to dl files from friend shares. Anonymous access unnaffected</source>
-        <translation>Dateiübertragung. Wenn Sie es abschalten, können Sie keine Dateien von Freunden herunterladen. Anonymer Zugriff nicht betroffen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Used by distant mail for immediate delivery using anonymous tunnels (turtle router)</source>
-        <translation>Wird von Distant-Mails für die sofortige Zustellung über anonyme Tunnel verwendet (Turtle-Router)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Exchange shared directories info, aka browsable(visible) files</source>
-        <translation>Austausch von Informationen über gemeinsam genutzte Verzeichnisse, d. h. durchsuchbare (sichtbare) Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Allows your node to tell to your friends which service are ON on your side, and vice-versa</source>
-        <translation>Ermöglicht Ihrem Knotenpunkt, Ihren Freunden mitzuteilen, welche Dienste auf Ihrer Seite eingeschaltet sind, und umgekehrt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Speed management</source>
-        <translation>Verwaltung der Geschwindigkeit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Used by distant chat, distant mail, and distant channels sync for transfer data using anonymous tunnels</source>
-        <translation>Verwendet von Distanz-Chat, Distanz-Mail und Distanz-Kanal-Synchronisation für die Datenübertragung über anonyme Tunnel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>IP filter lists exchange</source>
-        <translation>Austausch von IP-Filterlisten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Share user status like online, away, busy with friends</source>
-        <translation>Teilen Sie den Benutzerstatus, z.&#xa0;B. online, abwesend oder mit Freunden beschäftigt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Identity data exchange. Required by all identities-related functions like chats, forums, mail, etc</source>
-        <translation>Identitätsdatenaustausch. Erforderlich für alle identitätsbezogenen Funktionen wie Chats, Foren, E-Mail usw</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19945,22 +21057,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>Votes exchange - bans/upvotes for Identities</source>
-        <translation>Stimmenaustausch - Sperren/Upvotes für Identitäten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Used by distant mail for deferred delivery - stored at friends when target offline</source>
-        <translation>Wird von Distant-Mail für die verzögerte Zustellung verwendet – bei Freunden gespeichert, wenn das Ziel offline ist</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Measures the Round Trip Time between you and your friends</source>
-        <translation>Misst die Hin- und Rücklaufzeit zwischen Ihnen und Ihren Freunden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>unknown</source>
-        <translation>unbekannt</translation>
+        <translation type="unfinished">unbekannt</translation>
     </message>
     <message>
         <location line="-217"/>
@@ -19981,63 +21093,61 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
-        <translation>Quelltext anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation>Bild speichern</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation>Bild kopieren</translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
-        <translation>Quelle des Dokuments</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation>Baumansichtoptionen</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
-        <translation>Kopfzeile anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Sort by column …</source>
-        <translation>Nach Spalte sortieren ...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Sort Descending Order</source>
-        <translation>Sortierung absteigend</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Sort Ascending Order</source>
-        <translation>Aufsteigend sortieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
         <location line="+25"/>
         <source> [no title]</source>
-        <translation> [kein Titel]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Show column …</source>
-        <translation>Spalte anzeigen ...</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">Spalte anzeigen...</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[kein Titel]</translation>
     </message>
 </context>
 <context>
@@ -20063,7 +21173,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-589"/>
         <source>Download...</source>
-        <translation>Herunterladen...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
@@ -20073,7 +21183,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>Recommend in a message to...</source>
-        <translation>Empfehlen Sie in einer Nachricht an...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -20086,12 +21196,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/RemoteDirModel.cpp" line="-668"/>
         <source>[All friend nodes]</source>
-        <translation>[Alle Freundesknoten]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Only </source>
-        <translation>Nur </translation>
+        <translation>Nur</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -20101,7 +21211,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+506"/>
         <source>This node hasn&apos;t sent any directory information yet.</source>
-        <translation>Dieser Knoten hat noch keine Verzeichnisinformationen gesendet.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -20109,234 +21219,234 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../util/RichTextEdit.ui" line="+56"/>
         <source>Paragraph formatting</source>
-        <translation>Absatzformatierung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Font size</source>
-        <translation>Schriftgröße</translation>
+        <translation type="unfinished">Schriftgröße</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Text foreground color</source>
-        <translation>Vordergrundfarbe des Textes</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <location line="+19"/>
         <source>.</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Text background color</source>
-        <translation>Text-Hintergrundfarbe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
         <source>Undo (CTRL+Z)</source>
-        <translation>Rückgängig (STRG+Z)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Undo</source>
-        <translation>Rückgängig</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
         <location line="+3"/>
         <source>Redo</source>
-        <translation>Wiederholen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Cut (CTRL+X)</source>
-        <translation>Ausschneiden (STRG+X)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Cut</source>
-        <translation>Ausschneiden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Copy (CTRL+C)</source>
-        <translation>Kopieren (STRG+C)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Copy</source>
-        <translation>Kopieren</translation>
+        <translation type="unfinished">Kopieren</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Paste (CTRL+V)</source>
-        <translation>Einfügen (STRG+V)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Paste</source>
-        <translation>Einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Link (CTRL+L)</source>
-        <translation>Link (STRG+L)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Link</source>
-        <translation>Link</translation>
+        <translation type="unfinished">Link</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Bold</source>
-        <translation>Fett</translation>
+        <translation type="unfinished">Fett</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Italic (CTRL+I)</source>
-        <translation>Kursiv (STRG+I)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Italic</source>
-        <translation>Kursiv</translation>
+        <translation type="unfinished">Kursiv</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Underline (CTRL+U)</source>
-        <translation>Unterstrichen (STRG+U)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Underline</source>
-        <translation>Unterstrichen</translation>
+        <translation type="unfinished">Unterstrichen</translation>
     </message>
     <message>
         <location line="+47"/>
         <source>Bullet list (CTRL+-)</source>
-        <translation>Aufzählungsliste (STRG+-)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Bullet list</source>
-        <translation>Aufzählungsliste</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Ordered list (CTRL+=)</source>
-        <translation>Geordnete Liste (STRG+=)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Ordered list</source>
-        <translation>Geordnete Liste</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Decrease indentation (CTRL+,)</source>
-        <translation>Einzug verkleinern (STRG+,)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Increase indentation (CTRL+.)</source>
-        <translation>Einrückung vergrößern (STRG+.)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Attach a Picture</source>
-        <translation>Bild anhängen</translation>
+        <translation type="unfinished">Bild anhängen</translation>
     </message>
     <message>
         <location line="+87"/>
         <source>Text</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <translation type="unfinished">TextLabel</translation>
     </message>
     <message>
         <location filename="../util/RichTextEdit.cpp" line="+65"/>
         <source>Standard</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heading 1</source>
-        <translation>Überschrift 1</translation>
+        <translation type="unfinished">Überschrift 1</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heading 2</source>
-        <translation>Überschrift 2</translation>
+        <translation type="unfinished">Überschrift 2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heading 3</source>
-        <translation>Überschrift 3</translation>
+        <translation type="unfinished">Überschrift 3</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Heading 4</source>
-        <translation>Überschrift 4</translation>
+        <translation type="unfinished">Überschrift 4</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Monospace</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+59"/>
         <source>Remove character formatting</source>
-        <translation>Zeichenformatierung entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove all formatting</source>
-        <translation>Alle Formatierungen entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Edit document source</source>
-        <translation>Dokumentquelle bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+69"/>
         <source>Document source</source>
-        <translation>Quelle des Dokuments</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+93"/>
         <source>Create a link</source>
-        <translation>Einen Link erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Link URL:</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+287"/>
         <source>Load Picture File</source>
-        <translation>Bilddatei laden</translation>
+        <translation type="unfinished">Bilddatei laden</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>It remains %1 characters after HTML conversion.</source>
-        <translation>Es verbleiben %1 Zeichen nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
-        <translation>Warnung: Diese Nachricht ist mit %1 Zeichen zu groß nach der HTML-Konvertierung.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Text (optional)</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -20406,32 +21516,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+167"/>
         <source>Save Collection File.</source>
-        <translation>Kollektionsdatei speichern.</translation>
+        <translation type="unfinished">Kollektionsdatei speichern.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>File already exists.</source>
-        <translation>Datei existiert bereits.</translation>
+        <translation type="unfinished">Datei existiert bereits.</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>What do you want to do?</source>
-        <translation>Was willst du tun?</translation>
+        <translation type="unfinished">Was willst du tun?</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Overwrite</source>
-        <translation>Überschreiben</translation>
+        <translation type="unfinished">Überschreiben</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Merge</source>
-        <translation>Zusammenfügen</translation>
+        <translation type="unfinished">Zusammenfügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished">Abbrechen</translation>
     </message>
 </context>
 <context>
@@ -20454,12 +21564,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+310"/>
         <source>Destination:</source>
-        <translation>Ziel:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Right click to change download directory</source>
-        <translation>Rechtsklick zum Ändern des Download-Verzeichnisses</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -20570,17 +21680,17 @@ Die betroffenen Dateien sind rot markiert</translation>
     <message>
         <location line="-354"/>
         <source>Download files</source>
-        <translation>Dateien herunterladen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+100"/>
         <source>Specify...</source>
-        <translation>Spezifizieren...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Choose directory</source>
-        <translation>Verzeichnis wählen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+256"/>
@@ -20622,12 +21732,12 @@ Die betroffenen Dateien sind rot markiert</translation>
     <message>
         <location line="+84"/>
         <source>Do you want to remove them and all their children, too?</source>
-        <translation>Möchten Sie alle und ihre untergeordneten Elemente ebenfalls entfernen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+357"/>
         <source>Do you want to remove this file from the list?</source>
-        <translation>Möchten Sie diese Datei aus der Liste entfernen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-224"/>
@@ -20701,49 +21811,49 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
-        <translation>Name</translation>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Size</source>
         <comment>i.e: file size</comment>
-        <translation>Größe</translation>
+        <translation type="unfinished">Größe</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Completed</source>
-        <translation>Fertiggestellt</translation>
+        <translation type="unfinished">Fertiggestellt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Speed</source>
         <comment>i.e: Download speed</comment>
-        <translation>Geschwindigkeit</translation>
+        <translation type="unfinished">Geschwindigkeit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Progress / Availability</source>
         <comment>i.e: % downloaded</comment>
-        <translation>Fortschritt/Verfügbarkeit</translation>
+        <translation type="unfinished">Fortschritt/Verfügbarkeit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sources</source>
         <comment>i.e: Sources</comment>
-        <translation>Quellen</translation>
+        <translation type="unfinished">Quellen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Status</source>
-        <translation>Status</translation>
+        <translation type="unfinished">Status</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Speed / Queue position</source>
-        <translation>Geschwindigkeit/Warteschlangenposition</translation>
+        <translation type="unfinished">Geschwindigkeit/Warteschlangenposition</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20754,12 +21864,12 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
         <location line="+1"/>
         <source>Download time</source>
         <comment>i.e: Estimated Time of Arrival / Time left</comment>
-        <translation>Restzeit</translation>
+        <translation type="unfinished">Restzeit</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Hash</source>
-        <translation>Prüfsumme</translation>
+        <translation type="unfinished">Prüfsumme</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20822,34 +21932,34 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
-        <translation>Name</translation>
+        <translation type="unfinished">Name</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Id</source>
-        <translation>ID</translation>
+        <translation type="unfinished">ID</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Last contact</source>
-        <translation>Letzter Kontakt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>IP</source>
-        <translation>IP</translation>
+        <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
-        <translation>Profil-ID </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source> (Not yet validated)</source>
-        <translation> (Noch nicht bestätigt)</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -20857,7 +21967,7 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
     <message>
         <location filename="../gui/gxsforums/GxsForumModel.cpp" line="+340"/>
         <source>Title</source>
-        <translation>Titel</translation>
+        <translation type="unfinished">Titel</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20867,53 +21977,55 @@ Wenn du glaubst dass es eine korrekte Datei ist, entferne die entsprechende Zeil
     <message>
         <location line="+1"/>
         <source>Date</source>
-        <translation>Datum</translation>
+        <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Author</source>
-        <translation>Autor</translation>
+        <translation type="unfinished">Autor</translation>
     </message>
     <message>
         <location line="+206"/>
         <source>Information for this identity is currently missing.</source>
-        <translation>Informationen zu dieser Identität fehlen derzeit.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You have banned this ID. The message will not be
 displayed nor forwarded to your friends.</source>
-        <translation>Sie haben diese ID verbannt. Die Nachricht wird weder
-angezeigt oder an Ihre Freunde weitergeleitet.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>You have not set an opinion for this person,
  and your friends do not vote positively: Spam regulation 
 prevents the message to be forwarded to your friends.</source>
-        <translation>Sie haben keine Meinung zu dieser Person abgegeben,
- und Ihre Freunde stimmen nicht positiv ab: Die Spam-Verordnung 
-verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Message will be forwarded to your friends.</source>
-        <translation>Die Nachricht wird an Ihre Freunde weitergeleitet.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
-        <translation>[ ... Redigierte Nachricht ... ]</translation>
+        <translation type="unfinished">[ ... Redigierte Nachricht ... ]</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>[Notification]</source>
-        <translation>[Benachrichtigung]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>[Unknown]</source>
-        <translation>[Unbekannt]</translation>
+        <translation type="unfinished">[Unbekannt]</translation>
+    </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Fehlende Nachricht ... ]</translation>
     </message>
 </context>
 <context>
@@ -20921,84 +22033,72 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location filename="../gui/msgs/MessageModel.cpp" line="+168"/>
         <source>Date</source>
-        <translation>Datum</translation>
+        <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>From</source>
-        <translation>Von</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation>An</translation>
+        <translation type="unfinished">Von</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
-        <translation>Betreff</translation>
+        <translation type="unfinished">Betreff</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Tags</source>
-        <translation>Schlagwörter</translation>
+        <translation type="unfinished">Schlagwörter</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Click to sort by attachments</source>
-        <translation>Klicken, um nach Anhang zu sortieren</translation>
+        <translation type="unfinished">Klicken, um nach Anhang zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by subject</source>
-        <translation>Klicken, um nach Betreff zu sortieren</translation>
+        <translation type="unfinished">Klicken, um nach Betreff zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation>Klicken, um nach Lesestatus zu sortieren</translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Klicken, um nach Gelesen / Ungelesen zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation>Klicken, um nach Autor zu sortieren</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation>Klicken, um nach Zielort zu sortieren</translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Klicken, um nach Von zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by date</source>
-        <translation>Klicken, um nach Datum zu sortieren</translation>
+        <translation type="unfinished">Klicken, um nach Datum zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by tags</source>
-        <translation>Klicken, um nach Schlagwörter zu sortieren</translation>
+        <translation type="unfinished">Klicken, um nach Schlagwörter zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by star</source>
-        <translation>Klicken, um nach Kennzeichnung zu sortieren</translation>
+        <translation type="unfinished">Klicken, um nach Kennzeichnung zu sortieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Click to sort by junk status</source>
-        <translation>Klicken, um nach Junk-Status zu sortieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
-        <translation>[Benachrichtigung]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>[Unknown]</source>
-        <translation>[Unbekannt]</translation>
+        <translation type="unfinished">[Unbekannt]</translation>
     </message>
 </context>
 <context>
@@ -21012,7 +22112,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Setzt alle RetroShare-Einstellungen zurück.</translation>
     </message>
@@ -21025,7 +22125,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <location line="+1"/>
         <location line="+18"/>
         <source>filename</source>
-        <translation>Dateiname</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-17"/>
@@ -21035,7 +22135,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+1"/>
         <source>level</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21045,7 +22145,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+2"/>
         <source>style</source>
-        <translation>Stil</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21055,7 +22155,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+2"/>
         <source>stylesheet</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21065,7 +22165,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+1"/>
         <source>language</source>
-        <translation>Sprache</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21073,7 +22173,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Setzt die Sprache.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Logdatei &quot;%1&quot;: %2 kann nicht geöffnet werden</translation>
     </message>
@@ -21081,7 +22181,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <location line="+27"/>
         <location line="+6"/>
         <source>Invalid operating mode specified:</source>
-        <translation>Ungültige Betriebsart angegeben:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+212"/>
@@ -21094,37 +22194,41 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Datenverzeichnis konnte nicht erstellt werden: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Revision</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Sets RetroShare&apos;s operating mode.</source>
-        <translation>Legt den Betriebsmodus von RetroShare fest.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>RsLinkURL</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Open RsLink with protocol retroshare://</source>
-        <translation>RsLink mit Protokoll retroshare:// öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Open RsFile with or without arg.</source>
-        <translation>RsFile mit oder ohne Arg öffnen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>RetroShare GUI Usage Information</source>
-        <translation>RetroShare GUI-Nutzungsinformationen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>Ungültige Sprach-Codierung ausgewählt:</translation>
     </message>
@@ -21142,10 +22246,10 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
-        <translation>Fehler beim Zugriff auf die Registrierung. Möglicherweise benötigen Sie Administratorrechte.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -21159,12 +22263,12 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Gib einen Suchbegriff ein (min. 3 Zeichen)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Suche starten</translation>
     </message>
@@ -21226,7 +22330,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Leeren</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Schlüsselwörter</translation>
     </message>
@@ -21241,7 +22345,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Such-ID</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Dateiname</translation>
     </message>
@@ -21341,33 +22445,33 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Auswahl herunterladen</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Dateiname</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare-Link kopieren</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>RetroShare-Link senden</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Mark as bad</source>
-        <translation>Als schlecht markieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Download-Hinweis</translation>
     </message>
@@ -21404,7 +22508,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Alle entfernen</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Ordner</translation>
@@ -21412,20 +22516,20 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+209"/>
         <source>Obtained via </source>
-        <translation>Erhältlich über </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Neu(e) RetroShare-Link(s)</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Ordner öffnen</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Kollektion erstellen...</translation>
     </message>
@@ -21445,7 +22549,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Von Kollektion herunterladen...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Kollektion</translation>
     </message>
@@ -21453,7 +22557,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Nachbardetails</translation>
     </message>
@@ -21469,22 +22573,22 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Element entfernen</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>IP-Adresse:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Nachbar-ID:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Nachbarname:</translation>
     </message>
@@ -21501,7 +22605,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation>aber gemeldet:</translation>
     </message>
@@ -21526,8 +22630,8 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>&lt;p&gt;Dies ist die IP, von der dein Freund behauptet, dass er mit ihr verbunden ist. Wenn du deine IP gerade geändert hast, ist dies ein Fehlalarm. Falls nicht, bedeutet dies, dass deine Verbindung zu diesem Freund durch einen zwischengeschalteten Nachbarn weitergeleitet wird, was verdächtig wäre.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Diese Warnung ist hier um dich vor Netzwerktrafficweiterleitungsattacken zu schützen. In so einem Fall sieht der Freund mit dem du verbunden bist nicht deine externe IP sondern die IP des Angreifers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Wenn du allerdings deine IP gerade geändert hast (einige Netzprovider erzwingen eine Änderung der IP in regelmäßigem Abstand), dann bedeutet diese Warnung, dass dein Freund sich zu deiner neuen IP verbunden hat, bevor Retroshare etwas über den IP-Wechsel herausgefunden hat. In diesem Fall ist nicht falsch.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Du kannst dies Warnung ganz einfach unterdrücken, indem du deine eigene IP zur Whitelist hinzufügst (z.B. den IP-Bereich deines Netzproviders) oder diese Warnung komplett in Optionen-&amp;gt;Meldungen-&amp;gt;Feed deaktivierst.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -21535,7 +22639,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>möchte mit dir in RetroShare befreundet sein</translation>
     </message>
@@ -21566,7 +22670,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Erweitern</translation>
     </message>
@@ -21588,7 +22692,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     <message>
         <location line="+19"/>
         <source>Trust: </source>
-        <translation>Vertrauen: </translation>
+        <translation>Vertrauen:</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -21611,12 +22715,12 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Nachricht schreiben</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Verbindungsversuch</translation>
     </message>
@@ -21636,32 +22740,31 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Unbekannter (ausgehender) Verbindungsversuch</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Unbekanntes Sicherheitsproblem</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
-        <translation>SSL-Anfrage</translation>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation>Ein unbekannter Peer</translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
-        <translation>Unbekannt</translation>
+        <translation type="unfinished">Unbekannt</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Profile ID: </source>
-        <translation>Profil-ID: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Unbekannter Nachbar</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
@@ -21671,7 +22774,7 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Möchtest du diesen Freund entfernen?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Zertifikat hat die falsche Signatur!! Dieser Nachbar ist nicht, wer er vorgibt zu sein.</translation>
     </message>
@@ -21681,12 +22784,12 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Fehlendes/beschädigtes SSL-Zertifikat. Kein echter Retroshare-Benutzer</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>Zertifikat verursachte einen internen Fehler.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Nachbar/Netzknoten nicht in Freundesliste (PGP-ID=</translation>
     </message>
@@ -21745,14 +22848,14 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Lokale Adresse</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
@@ -21771,22 +22874,22 @@ verhindert, dass die Nachricht an Ihre Freunde weitergeleitet wird.</translation
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Lokales Netz</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Externer IP Adressen Finder</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Bekannte / vorherige IPs:</translation>
     </message>
@@ -21802,16 +22905,21 @@ wird es helfen Verbindungen aufzubauen, trotz geringer Anzahl von Freunden.
 Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>RetroShare erlauben, folgende Webseiten nach deiner IP zu fragen:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>KiB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Akzeptable Ports reichen von 10 bis 65535. Normalerweise sind Ports unter 1024 von deinem System reserviert.</translation>
     </message>
@@ -21821,49 +22929,23 @@ Es hilft auch, wenn du dich hinter einer Firewall/VPN befindest.</translation>
         <translation>Akzeptable Ports reichen von 10 bis 65535. Normalerweise sind Ports unter 1024 von deinem System reserviert.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Onion-Adresse</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Discovery Ein (empfohlen)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
-        <translation>Tor wurde von Retroshare automatisch konfiguriert. Hier sollten Sie keine Änderungen vornehmenen.</translation>
-    </message>
-    <message>
-        <location line="+825"/>
-        <source>sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation>lokal</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation>Externe</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation>
-
-Liste der gefundenen externen IP:
-</translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Discovery Aus</translation>
     </message>
@@ -21873,7 +22955,7 @@ Liste der gefundenen externen IP:
         <translation>Versteckt - Siehe Konfiguration</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>I2P-Adresse</translation>
     </message>
@@ -21898,129 +22980,141 @@ Liste der gefundenen externen IP:
         <translation>eingehend in Ordnung</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>Proxy scheint zu funktionieren.</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P-Proxy ist nicht aktiviert</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
-        <translation>SAMv3 läuft und ist zugänglich</translation>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
-        <translation>SAMv3 ist nicht zugänglich! Läuft i2p und ist SAM aktiviert?</translation>
+        <source>BOB is not accessible! Is it running?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation>Ihr Schlüssel verwendet die folgenden Algorithmen: %1 und %2</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation>unbekannter Schlüsseltyp</translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
-        <translation>RetroShare verwendet SAMv3, um einen %1-Tunnel bei %2:%3 einzurichten
-(ID: %4)
-
-Wenn Sie Optionen ändern, verwenden Sie die Schaltflächen unten, um SAMv3 neu zu starten.
-
-</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation>Offline, es wurde noch keine SAM-Sitzung eingerichtet.
-</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation>SAM versucht, eine Sitzung aufzubauen ... dies kann einige Zeit dauern.
-</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation>SAM-Sitzung eingerichtet! Richten Sie jetzt eine Weiterleitungssitzung ein ...
-</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation>Online, SAM funktioniert wie erwartet
-</translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation>Ihr Schlüssel verwendet %1 zum Signieren und %2 für die Verschlüsselung</translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation>Stoppen Sie zunächst den SAM-Tunnel, um einen neuen Schlüssel zu generieren</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation>Stoppen Sie zuerst den SAM-Tunnel, um einen Schlüssel zu laden</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation>Stoppen Sie zuerst den SAM-Tunnel, um SAM zu deaktivieren</translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>server</source>
-        <translation>Server</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>unknown</source>
-        <translation>unbekannt</translation>
+        <translation type="unfinished">unbekannt</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
-        <translation>Fordern Sie einen neuen Serverschlüssel an</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>load server key from base64</source>
-        <translation>Serverschlüssel von Base64 laden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Du bist durch den versteckten Dienst erreichbar.</translation>
     </message>
@@ -22029,17 +23123,15 @@ Wenn Sie Optionen ändern, verwenden Sie die Schaltflächen unten, um SAMv3 neu
         <source>The proxy is not enabled or broken.
 Are all services up and running fine??
 Also check your ports!</source>
-        <translation>Der Proxy ist nicht aktiviert oder defekt.
-Sind alle Dienste betriebsbereit?
-Überprüfen Sie auch Ihre Ports!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Versteckter Modus]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dies löscht die Liste der bekannten Adressen. Diese Funktion ist nützlich, wenn deine Adressliste aus irgendeinem Grund ungültige/irrelevante/abgelaufene Adressen enthält, von denen du nicht willst, dass sie an deine Freunde als Kontaktadressen weitergegeben werden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22049,7 +23141,7 @@ Sind alle Dienste betriebsbereit?
         <translation>Leeren</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>Download-Limit (KB/s) </translation>
     </message>
@@ -22064,24 +23156,23 @@ Sind alle Dienste betriebsbereit?
         <translation>Upload-Limit (KB/s) </translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Die Uploadbegrenzung deckt die gesamte Saoftware ab. Eine zu kleine Uploadbegrenzung kann letztendlich Dienste mit niedriger Priorität (Foren, Kanäle) blockieren. Ein Minimumwert von 50KB/s wird empfohlen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
-        <translation>WARNUNG:
-Diese Werte berücksichtigen nicht die Relais.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Konfiguriere deinen Tor und I2P SOCKS Proxy hier. Damit kannst du dich auch mit hidden Knoten verbinden.&lt;/p&gt;&lt;p&gt; &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22089,38 +23180,57 @@ Tunnel Wizard -&gt; Client Tunnel -&gt; SOCKS 4/4a/5 -&gt; enter a name -&gt; le
 Now enter the address (e.g. 127.0.0.1) and the port you&apos;ve picked before for the I2P Proxy.
 
 You can connect to Hidden Nodes, even if you are running a standard Node, so why not setup Tor and/or I2P?</source>
-        <translation>Tor-Socks-Proxy-Standard: 127.0.0.1:9050. In der Torrc-Konfiguration einstellen und hier aktualisieren.
-
-I2P-Socks-Proxy: Informationen zum Einrichten eines Client-Tunnels finden Sie unter http://127.0.0.1:7657/i2ptunnelmgr:
-Tunnel-Assistent -&gt; Client-Tunnel -&gt; SOCKS 4/4a/5 -&gt; geben Sie einen Namen ein -&gt; lassen Sie „Outproxies“ leer -&gt; geben Sie den Port ein (merken Sie sich!) [Vielleicht möchten Sie auch die Erreichbarkeit auf 127.0.0.1 setzen] -&gt; Weiter -&gt; &apos;Auto Start&apos; ankreuzen -&gt; Fertig!
-Geben Sie nun die Adresse (z. B. 127.0.0.1) und den Port ein, den Sie zuvor für den I2P-Proxy ausgewählt haben.
-
-Sie können sich mit versteckten Knoten verbinden, auch wenn Sie einen Standardknoten betreiben. Warum also nicht Tor und/oder I2P einrichten?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
-        <translation>aktiviert  erweiterte Einstellungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>advanced mode</source>
-        <translation>Erweiterter Modus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
-        <translation>I2P-Instanzadresse</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
         <source>127.0.0.1</source>
-        <translation>127.0.0.1</translation>
+        <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
-        <translation>Adresse</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
@@ -22130,57 +23240,62 @@ Sie können sich mit versteckten Knoten verbinden, auch wenn Sie einen Standardk
     <message>
         <location line="+13"/>
         <source>generate new</source>
-        <translation>neu erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+53"/>
         <source>Tunnel length (in/out)</source>
-        <translation>Tunnellänge (ein/aus)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+43"/>
         <source>Tunnel quantity (in/out)</source>
-        <translation>Tunnelmenge (ein/aus)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Tunnel variance (in/out)</source>
-        <translation>Tunnelvarianz (ein/aus)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+56"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Server Key - When a key it set it will be used to setup a hidden&lt;br/&gt;service for I2P. Otherwise only a client tunnel is created.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Server Key - Wenn ein Key gesetzt wird, wird er verwendet um einen hidden&lt;br/&gt;Service für I2P einzurichten. Ansonsten wird nur ein Client-Tunnel erstellt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>load key</source>
-        <translation>Ladeschlüssel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
-        <translation>Start</translation>
+        <translation type="unfinished">Start</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Restart</source>
-        <translation>Neustart</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Stop</source>
-        <translation>Stop</translation>
+        <translation type="unfinished">Stop</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
-        <translation>Eingehend</translation>
+        <translation type="unfinished">Eingehend</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Setup your hidden address (and port if needed)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Einstellen der hidden Adresse (und Port, falls erforderlich)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
@@ -22206,78 +23321,42 @@ This is your external address on the Tor/I2P network.
 Finally make sure that the Ports match the configuration.
 
 If you have issues connecting over Tor check the Tor logs too.</source>
-        <translation>Um Verbindungen zu empfangen, müssen Sie zunächst einen versteckten Tor/I2P-Service einrichten.
-
-Für Tor: Siehe torrc und Dokumentation für HOWTO-Details.
-
-Für I2P: Informationen zum Einrichten eines Servertunnels finden Sie unter http://127.0.0.1:7657/i2ptunnelmgr:
-Tunnel-Assistent -&gt; Servertunnel -&gt; Standard -&gt; Geben Sie einen Namen ein -&gt; Geben Sie die Adresse und den Port ein, den Ihr RS verwendet (siehe Lokale Adresse oben) -&gt; Aktivieren Sie „Autostart“ -&gt; Fertig!
-
-Sobald dies erledigt ist, fügen Sie die Onion/I2P (Base32)-Adresse in das Feld oben ein.
-Dies ist Ihre externe Adresse im Tor/I2P-Netzwerk.
-Stellen Sie abschließend sicher, dass die Ports mit der Konfiguration übereinstimmen.
-
-Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen Sie auch die Tor-Protokolle.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation>Automatisch I2P</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation>Aktivieren Sie I2P SAMv3 - eine Änderung dieser Einstellung erfordert einen Neustart, um vollständig wirksam zu werden</translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation>SAM zugänglich</translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
-        <translation>Relais</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Enable Relay Connections</source>
-        <translation>Aktivieren von Relais-Verbindungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Use Relay Servers</source>
-        <translation>Verwenden Sie Relay-Server</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Relay options</source>
-        <translation>Relaisoptionen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Number</source>
-        <translation>Nummer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Bandwidth per link</source>
-        <translation>Bandbreite pro Verbindung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Total Bandwidth</source>
-        <translation>Gesamtbandbreite</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -22297,17 +23376,17 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
     <message>
         <location line="+51"/>
         <source>Total:</source>
-        <translation>Gesamt:</translation>
+        <translation type="unfinished">Gesamt:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
-        <translation>Warnung: Diese Bandbreite summiert sich zur maximalen Bandbreite.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Relay Server Setup</source>
-        <translation>Relay-Server-Setup</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+29"/>
@@ -22317,7 +23396,7 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
     <message>
         <location line="+8"/>
         <source>Server DHT Key</source>
-        <translation>Server-DHT-Schlüssel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
@@ -22325,7 +23404,7 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
         <translation>Server entfernen</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22337,7 +23416,7 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>IP-Filter</translation>
     </message>
@@ -22360,7 +23439,7 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -22420,35 +23499,24 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
         <translation>Zu Whitelist hinzufügen</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Versteckte Dienstkonfiguration</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation>Erlauben Sie RetroShare, meine IP bei diesen DNS-Servern zu erfragen:</translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation>Liste der verwendeten OpenDns-Server.</translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
         <source>I2P Socks Proxy</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+17"/>
@@ -22457,18 +23525,18 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
-        <translation>I2P ausgehend Okay</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Dienstadresse</translation>
     </message>
@@ -22503,12 +23571,12 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
         <translation>Bitte geben Sie eine Dienstadresse ein</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>IP-Bereich</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Von DHT für IP-Maskierung gemeldet</translation>
     </message>
@@ -22531,22 +23599,22 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
         <translation>Von dir hinzugefügt</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;IPs auf der Whitelist werden aus folgenden Quellen gesammelt: IPs eines manuell ausgetauschten Zertifikats, von dir in diesem Fenster oder in den Sicherheitseingabeelementen eingegebene IP-Bereiche.&lt;/p&gt;&lt;p&gt;Das Standardverhalten von RetroShare ist (1) Verbindungen zu Nachbarn mit IP-Adressen in der Whitelist immer zulassen, auch wenn die IP ebenfalls in der Blacklist eingetragen ist;  (2) optional erfordern, dass die IPs in der Whitelist eingetragen sind. Du kannst dieses Verhalten für jeden Nachbarn im &amp;quot;Details&amp;quot;-Fenster eines jeden RetroShare-Netzknotens ändern.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT erlaubt es dir Verbindungdsanfragen von deinen Freunden mit Hilfe von BitTorrent&apos;s DHT zu beantworten. Es verbessert die Konnektivität enorm. Im DHT werden keine Informationen gespeichert. Es dient nur als Proxysystem um Verbindung mit anderen Retroshare Netzknoten aufzunehmen.&lt;/p&gt;&lt;p&gt;Der Discovery Dienst sendet node namen und ids deiner vertreuenswürdigen Konakte an verbundene Nachbarn, um ihnen bei der Wahl neuer Freunde zu helfen. Die Freundschaft wird jedoch nie automatisch hergestellt und beide Nachbarn müssen sich immer noch gegenseitig vertrauen, um eine Verbindung zu erlauben. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Die Kugel wird grün, sobald es RetroShare gelingt, deine eigene IP von den unten aufgeführten Webseiten zu bekommen - sofern du diese Aktion aktiviert hast. RetroShare nutzt auch noch andere Wege, um deine IP herauszufinden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Diese Liste wird automatisch mit Informationen aus veschiedenen Quellen gefüllt: Maskierte Nachbarn gemeldet vom DHT, von dir eingetragene IP Bereiche und von deinen Freunden übermittelte IP Bereiche. Die Grundeinstellung sollte dich gegen groß angelegte Verbindungsweiterleitungsattacken schützen.&lt;/p&gt;&lt;p&gt;Automatisches eintragen von markierten IPs kan die IPs deiner Freunde auf die Blacklist setzen. Benutze in diesem Fall das Kontextmenü, um sie auf die Whitelist zu verschieben.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22581,9 +23649,9 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
         <translation>Automatisch Bereiche DHT-maskierender IPs sperren, beginnend ab</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
-        <translation>Ausgehend manuelles Tor/I2P</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+31"/>
@@ -22591,12 +23659,12 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
         <translation>Tor Socks Proxy</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
-        <translation>Tor ausgehend Okay</translation>
+        <translation>Tor ausgehend o. k.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor-Proxy ist nicht aktiviert</translation>
     </message>
@@ -22676,7 +23744,7 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Wähle die Nachbarn, mit denen du den privaten Veröffentlichungsschlüssel teilen möchtest</translation>
     </message>
@@ -22686,12 +23754,12 @@ Wenn Sie Probleme beim Herstellen einer Verbindung über Tor haben, überprüfen
         <translation>Für Freund teilen</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Teilen</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Du kannst deine Freunde von deinem Kanal wissen lassen, indem du ihn mit ihnen teilst.
@@ -22711,9 +23779,9 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Ordnerfreigabe-Manager</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
-        <translation>Freigegebenes Verzeichnis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -22731,17 +23799,17 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Sichtbarkeit</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
-        <translation>Neu hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Freigabe hinzufügen</translation>
     </message>
@@ -22751,7 +23819,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Anwenden und Schließen</translation>
     </message>
@@ -22773,7 +23841,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+1"/>
         <source>Choose directory to share...</source>
-        <translation>Verzeichnis zum Freigeben auswählen...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -22783,32 +23851,32 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+48"/>
         <source>[Unset] (Double click to change)</source>
-        <translation>[Ungesetzt] (Doppelklick zum Ändern)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Double click to select which groups of friends can see the files</source>
-        <translation>Doppelklick, um auszuwählen, welche Gruppen von Freunden die Dateien sehen dürfen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Double click to change the name that friends will see.</source>
-        <translation>Doppelklicken Sie darauf, um den Namen zu ändern, den Ihre Freunde sehen werden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Double click to change shared directory path</source>
-        <translation>Doppelklick zum Ändern des gemeinsamen Verzeichnispfades</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Directory does not exist! Double click to change shared directory path</source>
-        <translation>Das Verzeichnis existiert nicht! Doppelklicken Sie, um den Pfad zum gemeinsamen Verzeichnis zu ändern</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+46"/>
         <source>[All friend nodes]</source>
-        <translation>[Alle Freundesknoten]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+28"/>
@@ -22823,7 +23891,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+21"/>
         <source>Choose a directory to share</source>
-        <translation>Wählen Sie ein Verzeichnis zur Freigabe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+64"/>
@@ -22842,7 +23910,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Ordner nicht gefunden oder Ordnername nicht akzeptiert.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Dies ist eine Liste freigegebener Ordner. Du kannst mit den Knöpfen unten Ordner hinzufügen und entfernen. Wenn du einen neuen Ordner hinzufügst sind alle Dateien darin von Anfang an freigegeben. Du kannst für jeden freigegebenen Ordner die Freigabeflags separat festlegen.</translation>
     </message>
@@ -22850,14 +23918,14 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Dateien</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Configure shared directories</source>
-        <translation>Freigegebene Verzeichnisse konfigurieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+73"/>
@@ -22901,16 +23969,11 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Erzwingt die erneute Überprüfung aller freigegebenen Verzeichnisse. Während sich die automatische Dateiprüfung aus Effizienzgründen nur um neue/entfernte Dateien kümmert, erzwingt diese Schaltfläche die erneute Prüfung aller Dateien und führt möglicherweise ein erneutes Hashing vorhandener Dateien durch, die sich möglicherweise geändert haben. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>Dateien prüfen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Auswahl herunterladen</translation>
     </message>
@@ -22920,7 +23983,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>RetroShare-Links in die Zwischenablage kopieren</translation>
     </message>
@@ -22935,9 +23998,9 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>RetroShare-Links senden</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
-        <translation>Einige Dateien wurden ausgelassen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+33"/>
@@ -22951,14 +24014,14 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Empfehlung(en)</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Kollektion erstellen...</translation>
     </message>
     <message>
         <location line="-3"/>
         <source>Stop sharing this file</source>
-        <translation>Freigabe dieser Datei beenden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -22976,39 +24039,39 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Von Kollektion herunterladen...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
-        <translation>Einige Dateien wurden ausgelassen, weil sie noch nicht indexiert wurden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+682"/>
         <source>Search string should be at least 3 characters long.</source>
-        <translation>Der Suchbegriff sollte mindestens 3 Zeichen lang sein.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+44"/>
         <source>More than 3000 results. Add more/longer search words to select less.</source>
-        <translation>Mehr als 3000 Ergebnisse. Fügen Sie mehr/längere Suchbegriffe hinzu, um weniger auszuwählen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+36"/>
         <source>Warning: You reach max (%1) files in flat list. No more will be added.</source>
-        <translation>Warnung: Sie haben die maximale Anzahl (%1) von Dateien in der Flat-Liste erreicht. Es werden keine weiteren hinzugefügt.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+157"/>
         <source>No result.</source>
-        <translation>Kein Ergebnis.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>More than %1 results. Add more/longer search words to select less.</source>
-        <translation>Mehr als %1 Ergebnisse. Fügen Sie mehr/längere Suchbegriffe hinzu, um weniger auszuwählen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Found %1 results.</source>
-        <translation>%1 Ergebnisse gefunden.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -23031,7 +24094,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
     <message>
         <location line="+0"/>
         <source>New Msg</source>
-        <translation>Neue Nachricht</translation>
+        <translation>Neue Nachr.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -23119,12 +24182,12 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Konfiguration laden</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Oberfläche erstellen</translation>
     </message>
@@ -23148,7 +24211,7 @@ Wähle die Freunde, mit denen du den Kanal teilen willst.</translation>
         <translation>Passwort speichern</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Anmelden</translation>
     </message>
@@ -23168,11 +24231,7 @@ Die aktuellen Identitäten/Orte werden nicht geändert.</translation>
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans&apos;; font-size:10pt; 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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;New Profile/Node&lt;/span&gt;&lt;/a&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;
-&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;Sans&apos;; font-size:10pt; 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;a href=&quot;Create new Profile...&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;Neues Profil/Knoten&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/StartDialog.cpp" line="+17"/>
@@ -23312,7 +24371,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
     <message>
         <location line="+3"/>
         <source>Identities</source>
-        <translation>Identitäten</translation>
+        <translation type="unfinished">Identitäten</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -23322,7 +24381,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
     <message>
         <location line="+3"/>
         <source>Gxs Transport</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -23505,7 +24564,7 @@ Du kannst die Auswahl in den Optionen zurücksetzen.</translation>
         <translation>Statusnachricht</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Nachricht:</translation>
     </message>
@@ -23750,7 +24809,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Alle Schlagwörter entfernen</translation>
     </message>
@@ -23778,161 +24837,117 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../TorControl/TorControlWindow.ui" line="+20"/>
         <source>Dialog</source>
-        <translation>Dialog</translation>
+        <translation type="unfinished">Dialog</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Setting up Tor...</source>
-        <translation>Einrichten von Tor...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Not started</source>
-        <translation>Nicht gestartet</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
-        <translation>Hidden adresse:</translation>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
-        <translation>Nicht festgelegt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-10"/>
         <source>Onion address:</source>
-        <translation>Onion adresse:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation>Nicht verbunden</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation>Verbinde</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation>Socket verbunden</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation>Authentifizierung</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation>Authentifiziert</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation>Hidden Service bereit</translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation>Tor bereit</translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
-        <translation>Prüfe, ob Tor in deinem ausführbaren Pfad zugänglich ist</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
-        <translation>[Warten auf Tor...]</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Diese Version von Retroshare benutzt Tor, um sich mit deinen vertrauenswürdigen Knoten zu verbinden.&lt;/p&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
-        <translation>Tor ist derzeit offline</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Tor is OK</source>
-        <translation>Tor ist OK</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
-        <translation>Keine Tor-Konfiguration</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
-        <translation>Tor-Proxy ist OK</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Tor proxy is not available</source>
-        <translation>Tor-Proxy ist nicht verfügbar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>I2P</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>i2p proxy is OK</source>
-        <translation>i2p-Proxy ist OK</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>i2p proxy is not available</source>
-        <translation>i2p-Proxy ist nicht verfügbar</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Übertragungsoptionen</translation>
@@ -23943,37 +24958,32 @@ p, li { white-space: pre-wrap; }
         <translation>Maximale gleichzeitige Downloads:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
-        <translation>Freigegebene Verzeichnisse</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Automatically share incoming directory (Recommended)</source>
-        <translation>Eingehende Ordner automatisch freigeben (Empfohlen)</translation>
+        <translation type="unfinished">Eingehende Ordner automatisch freigeben (Empfohlen)</translation>
     </message>
     <message>
-        <location line="-22"/>
-        <source>Directories</source>
-        <translation>Verzeichnisse</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation>Freigegebene Verzeichnisse konfigurieren</translation>
-    </message>
-    <message>
-        <location line="+28"/>
-        <source>Auto-check shared directories every </source>
-        <translation>Freigegebene Verzeichnisse automatisch überprüfen </translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location line="-10"/>
+        <source>Edit Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="-12"/>
+        <source>Directories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Auto-check shared directories every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source> minute(s)</source>
         <translation> Minute(n)</translation>
     </message>
@@ -23985,7 +24995,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>follow symbolic links</source>
-        <translation>symbolischen Links folgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
@@ -23995,12 +25005,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Ignore duplicate files/directories</source>
-        <translation>Doppelte Dateien/Verzeichnisse ignorieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Maximum depth (0=unlimited):</source>
-        <translation>Maximale Tiefe (0=unbegrenzt):</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -24010,7 +25020,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+11"/>
         <source>Ignore files ending with:</source>
-        <translation>Ignoriere Dateien, die mit:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -24020,7 +25030,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+11"/>
         <source>ignore files starting with:</source>
-        <translation>Dateien ignorieren, die mit:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -24046,19 +25056,19 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Automatically donwload RsCollection file content (Not recommended)</source>
-        <translation>Inhalt der RsCollection-Datei automatisch herunterladen (nicht empfohlen)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Partials Directory</source>
-        <translation>Partials-Verzeichnis</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+51"/>
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24067,14 +25077,9 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation>Mindestschriftgröße für freigegebene Dateien</translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
-        <translation>Maximale Uploads pro Freund (0 = keine Begrenzung)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -24094,15 +25099,10 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Allow direct download:</source>
-        <translation>Direkten Download zulassen:</translation>
-    </message>
-    <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -24154,12 +25154,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Per user</source>
-        <translation>Pro Benutzer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Trust friend nodes with banned files</source>
-        <translation>Vertrauen Sie befreundeten Knoten mit gebannten Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-153"/>
@@ -24167,9 +25167,14 @@ p, li { white-space: pre-wrap; }
         <translation>Max. weiterzuleitende Tunnelanfragen pro Sekunde:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;bewirkt dass die Übertragung 1MB große Dateistücke in aufsteigender Ordnung anfordert, so dass eine Vorschau während des Downloads ermögllicht wird. &lt;span style=&quot; font-weight:600;&quot;&gt;Zufällig&lt;/span&gt; ist rein zufällig und begünstigt Schwarmverhalten. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressiv&lt;/span&gt; ist ein Kompromiss der das nächste Teilstück zufällig innerhalb von weniger als 50 MB nach dem Ende der patiellen Datei auswählt. Das erlaubt etwas Zufälligket während es hohe Initialisationzeiten für leere Dateien vehindert.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RetroShare wird alle Übertragungen und das Speichern von Konfigurationsdaten aussetzen, wenn der freie Festplattenspeicher unter dieses Limit fällt. Auf einigen Systemen verhindert dies Informationsverlust. Ein Hinweisfenster wird dich warnen, wenn das passiert.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RetroShare wird alle Übertragungen und das Speichern von Konfigurationsdaten aussetzen, wenn der freie Festplattenspeicher unter dieses Limit fällt. Auf einigen Systemen verhindert dies Informationsverlust. Ein Hinweisfenster wird dich warnen, wenn das passiert.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -24177,34 +25182,24 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Dieser Wert kontrolliert, wie viele Tunnel-Anfragen dein Nachbar pro Sekunde weiterleiten darf.&lt;/p&gt;&lt;p&gt;Wenn du eine große Internet-Bandbreite hast, kannst du diesen auf 30–40 erhöhen, um statistisch längere Tunnel zu ermöglichen. Vorsicht! Dies erzeugt viele kleine Pakete die deine eigenen Dateitransfers merklich verlangsamen können.&lt;/p&gt;&lt;p&gt;Voreinstellung ist 20. Wenn du dir nicht sicher bist, belasse es dabei.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation>Warnung</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation>Auf Windows-Systemen kann das zufällige Schreiben in die Mitte großer leerer Dateien dazu führen, dass die Software mehrere Sekunden lang hängen bleibt. Möchten Sie diese Option trotzdem verwenden (andernfalls „progressiv“ verwenden)?</translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
-        <translation>Eingehendes Verzeichnis festlegen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Invalid Input. Have you got the right to write on it?</source>
-        <translation>Ungültige Eingabe. Haben Sie die Rechte, darauf zu schreiben?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Set Partials Directory</source>
-        <translation>Partialverzeichnis festlegen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Invalid Input. It can&apos;t be an already shared directory.</source>
-        <translation>Ungültige Eingabe. Es kann sich nicht um ein bereits freigegebenes Verzeichnis handeln.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/settings/TransferPage.h" line="+42"/>
@@ -24215,47 +25210,63 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Download abgeschlossen</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>You have %1 completed transfers</source>
-        <translation>Sie haben %1 transfer abgeschlossen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>You have %1 completed transfer</source>
-        <translation>Sie haben %1 transfer abgeschlossen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>%1 completed transfers</source>
-        <translation>%1 transfers abgeschlossen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>%1 completed transfer</source>
-        <translation>%1 transfer abgeschlossen</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Du hast %1 fertige Downloads</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Du hast %1 fertigen Download</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 fertige Downloads</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 fertiger Download</translation>
     </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Uploads</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Name</translation>
@@ -24342,7 +25353,7 @@ p, li { white-space: pre-wrap; }
         <location line="-58"/>
         <source>Peer</source>
         <comment>i.e: user name / tunnel id</comment>
-        <translation>Nachbar</translation>
+        <translation type="unfinished">Nachbar</translation>
     </message>
     <message>
         <location line="+61"/>
@@ -24462,12 +25473,7 @@ p, li { white-space: pre-wrap; }
         <translation>Spezifizieren...</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp; Dateiübertragung&lt;/h1&gt;&lt;p&gt;Retroshare bietet zwei Möglichkeiten, Dateien zu übertragen: direkte Übertragungen von Ihren Freunden und anonyme, getunnelte Fernübertragungen. Außerdem ist der Dateitransfer quellenübergreifend und erlaubt das Schwärmen (Sie können beim Herunterladen eine Quelle sein)&lt;/p&gt;&lt;p&gt;Sie können Dateien über das Symbol &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; in der linken Seitenleiste teilen. Diese Dateien werden in der Registerkarte &quot;Meine Dateien&quot; aufgelistet. Sie können für jede Freundesgruppe entscheiden, ob sie diese Dateien in der Registerkarte &quot;Dateien von Freunden&quot; sehen können oder nicht&lt;/p&gt;&lt;p&gt;Die Registerkarte &quot;Suchen&quot; zeigt Dateien aus den Dateilisten Ihrer Freunde und entfernte Dateien an, die über das Multi-Hop-Tunnelsystem anonym erreicht werden können.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>In Warteschlange verschieben...</translation>
     </message>
@@ -24492,7 +25498,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ordner auswählen</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Anonymer Ende-zu-Ende-verschlüsselter Tunnel 0x</translation>
     </message>
@@ -24500,7 +25506,7 @@ p, li { white-space: pre-wrap; }
         <location line="+1"/>
         <location line="+5"/>
         <source>Tunnel</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
@@ -24513,7 +25519,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24546,17 +25552,7 @@ p, li { white-space: pre-wrap; }
         <translation>Datei %1 ist nicht komplett. Falls es eine Mediadatei ist, dann versuche &quot;Vorschau&quot;.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation>Warnung</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation>Auf Windows-Systemen kann das Schreiben in der Mitte großer leerer Dateien dazu führen, dass die Software für einige Sekunden hängen bleibt. Möchten Sie diese Option trotzdem verwenden?</translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Dateinamen ändern</translation>
     </message>
@@ -24571,7 +25567,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bitte gib einen neuen -- und gültigen -- Dateinamen ein</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Alle erweitern</translation>
@@ -24674,42 +25670,47 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Peer</source>
-        <translation>Nachbar</translation>
+        <translation type="unfinished">Nachbar</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+3"/>
         <source>Show Peer Column</source>
-        <translation>Peer-Spalte anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Transferred Column</source>
-        <translation>Übertragene Spalte anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Progress</source>
-        <translation>Fortschritt</translation>
+        <translation type="unfinished">Fortschritt</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Show Progress Column</source>
-        <translation>Fortschrittsspalte anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Spalten</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Dateiübertragungen</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Pfad</translation>
     </message>
@@ -24719,7 +25720,7 @@ p, li { white-space: pre-wrap; }
         <translation>Pfadspalte anzeigen</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>Konnte Vorschaudatei nicht löschen</translation>
     </message>
@@ -24729,7 +25730,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nochmal versuchen?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Kollektion erstellen...</translation>
     </message>
@@ -24744,17 +25745,17 @@ p, li { white-space: pre-wrap; }
         <translation>Kollektion ansehen...</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Kollektion</translation>
     </message>
     <message>
         <location line="+302"/>
         <source>%1 tunnels</source>
-        <translation>%1 Tunnel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Anonymer Tunnel 0x</translation>
     </message>
@@ -24787,12 +25788,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-485"/>
         <source>Show Empty</source>
-        <translation>Leere anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+392"/>
         <source>Temporary shared files</source>
-        <translation>Temporäre freigegebene Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
@@ -24803,7 +25804,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="-74"/>
         <source>Empty</source>
-        <translation>Leer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+85"/>
@@ -24814,7 +25815,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+169"/>
         <source>Friends Directories [updating...]</source>
-        <translation>Verzeichnisse von Freunden [Aktualisierung...]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -24824,7 +25825,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>My Directories [updating...]</source>
-        <translation>Meine Verzeichnisse [Aktualisierung...]</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -24834,7 +25835,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source># Files</source>
-        <translation># Dateien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -24883,7 +25884,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-190"/>
         <location line="+19"/>
         <source>Unknown Peer</source>
-        <translation>Unbekannter Nachbar</translation>
+        <translation type="unfinished">Unbekannter Nachbar</translation>
     </message>
 </context>
 <context>
@@ -24927,7 +25928,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+20"/>
         <source>Request id: %1	 %3 secs ago	 from  %2	 %4 (%5 hits)</source>
-        <translation>Anfrage-ID: vor %1 %3 Sekunden von %2 %4 (%5 Treffer)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+12"/>
@@ -24973,7 +25974,11 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+48"/>
         <source>File transfer tunnels</source>
-        <translation>Dateiübertragungstunnel</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">Anonyme Tunnel</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -24983,7 +25988,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+1"/>
         <source>GXS sync tunnels</source>
-        <translation>GXS sync Tunnel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+76"/>
@@ -25168,49 +26173,48 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>RetroShare-Weboberfläche aktivieren</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation>Status:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Web-Parameter</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Password:</source>
-        <translation>Passwort:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Web interface directory:</source>
-        <translation>Verzeichnis der Webschnittstelle:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select directory for webinterface files (advanced)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Verzeichnis für Webinterface-Dateien auswählen (erweitert)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Apply settings</source>
-        <translation>Einstellungen übernehmen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Start web browser</source>
-        <translation>Starten Sie den Webbrowser</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hinweis: Diese Einstellungen haben keinen Einfluss auf den retroshare-Service, der über einen Kommandozeilenschalter verfügt, um die Web-Schnittstelle zu aktivieren und den Listening-Port auszuwählen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port:</source>
+        <translation type="vanished">Port:</translation>
     </message>
     <message>
         <location line="-28"/>
@@ -25218,27 +26222,21 @@ p, li { white-space: pre-wrap; }
         <translation>Zugriff von allen IP-Adressen erlauben (standardmäßig nur localhost)</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <source>Apply setting and start browser</source>
+        <translation type="vanished">Einstellung anwenden und Browser starten</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
-        <translation>Bitte wählen Sie das Verzeichnis aus, in dem sich die retroshare webui dateien befinden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation>Passwort fehlt</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation>Bitte legen Sie eine Passwort fest, um den Zugriff auf die WEB-Schnittstelle zu schützen.</translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>Weboberfläche nicht aktiviert</translation>
     </message>
@@ -25248,12 +26246,12 @@ p, li { white-space: pre-wrap; }
         <translation>Die Weboberfläche ist nicht aktiviert. Aktivieren Sie sie unter Einstellungen -&gt; Weboberfläche.</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>Start der Weboberfläche fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Weboberfläche</translation>
     </message>
@@ -25374,7 +26372,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+33"/>
         <source>Cancel </source>
-        <translation>Abbrechen </translation>
+        <translation>Abbrechen</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -25390,7 +26388,11 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki-Seiten</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Neue Gruppe</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Seitenname</translation>
     </message>
@@ -25405,7 +26407,7 @@ p, li { white-space: pre-wrap; }
         <translation>Orig. ID</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25462,7 +26464,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Create Group</source>
-        <translation>Gruppe erstellen</translation>
+        <translation type="unfinished">Gruppe erstellen</translation>
     </message>
     <message>
         <location line="+493"/>
@@ -25493,7 +26495,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Bearbeitungsverlauf der Seite</translation>
     </message>
@@ -25528,7 +26530,7 @@ p, li { white-space: pre-wrap; }
         <translation>Seiten-ID</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25558,18 +26560,14 @@ p, li { white-space: pre-wrap; }
         <translation>Schlagwörter</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation>Verlauf</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Bearbeitungsverlauf anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -25590,7 +26588,7 @@ p, li { white-space: pre-wrap; }
         <translation>Rückgängig machen</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Absenden</translation>
     </message>
@@ -25662,20 +26660,29 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">TimeRange</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
-        <translation>Account erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Post Pulse</source>
-        <translation>Beitrag erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Aktualisieren</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+48"/>
@@ -25685,84 +26692,152 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+15"/>
         <source>Others</source>
-        <translation>Andere</translation>
+        <translation type="unfinished">Andere</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
-        <translation>Wem folgen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+50"/>
         <source>HomePage</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+24"/>
         <source>&lt;</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+11"/>
         <source>&gt;</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Show Posts from </source>
-        <translation>Beiträge anzeigen von </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
         <source> All Time</source>
-        <translation> Allzeit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Last 24 hours</source>
-        <translation>Letzte 24 Stunden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Last 7 days</source>
-        <translation>Letzte 7 Tage</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Last 30 days</source>
-        <translation>Letzte 30 Tage</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Letzter Monat</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Letzte Woche</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Heute</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Neu</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">von</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">bis</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Suchen/Filtern</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Netzwerkweit</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Konten verwalten</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Zeige:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Du</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Freunde</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Folgend</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Benutzerdefiniert</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Konto 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Konto 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Konto 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">CheckBox</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Puls an Wire senden</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
-        <translation>RetroShare</translation>
+        <translation type="unfinished">RetroShare</translation>
     </message>
     <message>
         <location line="-93"/>
         <location line="+93"/>
         <source>Please create or choose Wire Groupd first</source>
-        <translation>Bitte erstelle oder wählen Sie ihr Wire Account</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.h" line="+80"/>
         <source>The Wire</source>
-        <translation>The Wire</translation>
+        <translation type="unfinished">The Wire</translation>
     </message>
 </context>
 <context>
@@ -25770,37 +26845,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/TheWire/WireGroupDialog.cpp" line="+78"/>
         <source>Create New Wire</source>
-        <translation>Neuen Account erstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Create</source>
-        <translation>Erstellen</translation>
+        <translation type="unfinished">Erstellen</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Wire</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Edit Wire</source>
-        <translation>Account bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Update Wire</source>
-        <translation>Account aktualisieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add Wire Admins</source>
-        <translation>Admins hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Select Wire Admins</source>
-        <translation>Admins auswählen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -25808,44 +26883,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/TheWire/WireGroupExtra.ui" line="+20"/>
         <source>Form</source>
-        <translation>Formular</translation>
+        <translation type="unfinished">Formular</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
         <location line="+7"/>
         <source>MastHead background Image</source>
-        <translation>Hintergrundbild</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
-        <translation>Bild auswählen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
-        <translation>Schlagwort:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
-        <translation>Ort:</translation>
+        <translation type="unfinished">Ort:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
-        <translation>Hintergrund Bild</translation>
-    </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation>Benutzen Sie die Maus, um das Bild zu zoomen und für Ihren Hintergrund anzupassen.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -25853,13 +26921,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../gui/TheWire/WireGroupItem.ui" line="+14"/>
         <source>Form</source>
-        <translation>Formular</translation>
+        <translation type="unfinished">Formular</translation>
     </message>
     <message>
         <location line="+53"/>
         <location line="+65"/>
         <source>Avatar</source>
-        <translation>Avatar</translation>
+        <translation type="unfinished">Avatar</translation>
     </message>
     <message>
         <location line="-49"/>
@@ -25869,12 +26937,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+20"/>
         <source>Type</source>
-        <translation>Typ</translation>
+        <translation type="unfinished">Typ</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>\/</source>
-        <translation>\/</translation>
+        <translation type="unfinished">\/</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -25889,43 +26957,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+7"/>
         <source>Edit Profile</source>
-        <translation>Profil editieren</translation>
-    </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation>Eigene</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation>Folgend</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation>Entfolgen</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation>Andere</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation>Folgen</translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Unbekannt</translation>
@@ -25965,7 +27003,7 @@ p, li { white-space: pre-wrap; }
         <location line="-7"/>
         <source> PB</source>
         <comment>petabytes (1024 terabytes)</comment>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+145"/>
@@ -26003,7 +27041,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1J %2T</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>Ki</translation>
@@ -26034,15 +27072,19 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+23"/>
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
-        <translation>Bilder (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Bilder (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
     </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
-        <translation> Akzeptieren Sie von diesem Profil signierte Verbindungen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -26052,22 +27094,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
-        <translation>In dieser Spalte wird die von Ihnen angegebene Vertrauensstufe angezeigt und ob Sie den PGP-Schlüssel des Profils signiert haben</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Did that peer sign your own profile PGP key</source>
-        <translation>Hat dieser Peer Ihren eigenen Profil-PGP-Schlüssel signiert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>PGP Key Id of that profile</source>
-        <translation>PGP-Schlüssel-ID dieses Profils</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Last time this key was used (received time, or to check connection)</source>
-        <translation>Wann dieser Schlüssel zuletzt verwendet wurde (Empfangszeit oder zur Überprüfung der Verbindung)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
@@ -26082,12 +27124,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+3"/>
         <source>Trust level</source>
-        <translation>Vertrauens Level</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Has signed your key?</source>
-        <translation>Haben Sie Ihren Schlüssel signiert?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -26107,17 +27149,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+5"/>
         <source>Marginally trusted peer</source>
-        <translation>Wenig vertrauenswürdiger Peer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Fully trusted peer</source>
-        <translation>Völlig vertrauenswürdige rPeer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Untrusted peer</source>
-        <translation>Nicht vertrauenswürdiger Peer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
@@ -26157,7 +27199,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>Denied</source>
-        <translation>Verweigert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+14"/>
@@ -26168,8 +27210,7 @@ p, li { white-space: pre-wrap; }
         <location line="+7"/>
         <source> has authenticated you. 
 Right-click and select &apos;make friend&apos; to be able to connect.</source>
-        <translation> hat dich authentifiziert.
-Klicken Sie mit der rechten Maustaste und wählen Sie „Freundschaft schließen“, um eine Verbindung herzustellen.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -26177,17 +27218,17 @@ Klicken Sie mit der rechten Maustaste und wählen Sie „Freundschaft schließen
     <message>
         <location filename="../gui/settings/PluginsPage.cpp" line="+62"/>
         <source>Plugin disabled. Click the enable button and restart Retroshare</source>
-        <translation>Plugin deaktiviert. Klicken Sie auf die Schaltfläche &quot;Aktivieren&quot; und starten Sie Retroshare neu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>[disabled]</source>
-        <translation>[deaktivert]</translation>
+        <translation type="unfinished">[deaktivert]</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>No API number supplied. Please read plugin development manual.</source>
-        <translation>Keine API-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
+        <translation type="unfinished">Keine API-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -26196,37 +27237,37 @@ Klicken Sie mit der rechten Maustaste und wählen Sie „Freundschaft schließen
         <location line="+4"/>
         <location line="+4"/>
         <source>[loading problem]</source>
-        <translation>[Ladeproblem]</translation>
+        <translation type="unfinished">[Ladeproblem]</translation>
     </message>
     <message>
         <location line="-13"/>
         <source>No SVN number supplied. Please read plugin development manual.</source>
-        <translation>Keine SVN-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
+        <translation type="unfinished">Keine SVN-Nummer angegeben. Bitte konsultiere das Handbuch für die Entwicklung von Plug-ins.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Loading error.</source>
-        <translation>Fehler beim Laden.</translation>
+        <translation type="unfinished">Fehler beim Laden.</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Missing symbol. Wrong version?</source>
-        <translation>Fehlendes Symbol. Falsche Version?</translation>
+        <translation type="unfinished">Fehlendes Symbol. Falsche Version?</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>No plugin object</source>
-        <translation>Kein Plug-in Objekt</translation>
+        <translation type="unfinished">Kein Plug-in Objekt</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Plugins is loaded.</source>
-        <translation>Plug-in ist geladen.</translation>
+        <translation type="unfinished">Plug-in ist geladen.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unknown status.</source>
-        <translation>Unbekannter Status.</translation>
+        <translation type="unfinished">Unbekannter Status.</translation>
     </message>
     <message>
         <location line="+67"/>
@@ -26246,7 +27287,7 @@ schädlichem Verhalten von Plug-ins.</translation>
     <message>
         <location filename="../gui/settings/PluginsPage.h" line="+41"/>
         <source>Plugins</source>
-        <translation>Plug-ins</translation>
+        <translation type="unfinished">Plug-ins</translation>
     </message>
 </context>
 </TS>
diff --git a/retroshare-gui/src/lang/retroshare_el.ts b/retroshare-gui/src/lang/retroshare_el.ts
index 1b43e7f05..a334a32f9 100644
--- a/retroshare-gui/src/lang/retroshare_el.ts
+++ b/retroshare-gui/src/lang/retroshare_el.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Προσθήκη σχολίου</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: Σύνθετη Αναζήτηση </translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Κριτήρια αναζήτησης</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Προσθήκη κριτηρίου αναζήτησης</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Επαναφορά κριτηρίου αναζήτησης</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Διακοπη αναζητησης</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Αναζήτηση</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Δημιουργία άλμπουμ</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Όνομα άλμπουμ:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Κατηγορία:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Ζώα</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Οικογένεια</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Φίλοι</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Λουλούδια</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Διακοπές</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Τοπία</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Κατοικίδια ζώα</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Πορτρέτα</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Ταξίδια</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Εργασία</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Τυχαία</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Λεζάντα:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Όπου:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Φωτογράφος:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Περιγραφή:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Μοιρασμα ρυθμισεων</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Πολιτική:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Ποιότητα:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Σχόλια:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Ταυτότητα:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Δημοσια</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Περιορισμένη</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Αλλαγή μεγέθους εικόνων (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Αλλαγή μεγέθους εικόνων (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Αποστολή αυθεντικών εικόνων</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Δεν επιτρέπονται σχόλια</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Επικυρωμένα σχόλια</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Επιτρέπονται όλα τα σχόλια</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Δημοσίευση με ταυτότητα</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Πίσω</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Προσθήκη φωτογραφιών</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Δημοσίευση άλμπουμ</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Ατιτλο άλμπουμ</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Πειτε κατι σχετικά με αυτό το άλμπουμ...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Πού τραβήχτηκαν αυτές;</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Φορτωση εικονιδιων του άλμπουμ</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Άλμπουμ</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Εικονιδια του άλμπουμ</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Ετικέτα Κειμένου</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Περίληψη</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>Λεζάντα</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Πού:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Πότε</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Περιγραφή:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Ρυθμίσεις Διαμοιρασμού</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Σχόλια</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Δημοσιεύση ταυτότητας</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Ορατότητα</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -269,7 +483,7 @@ p, li { white-space: pre-wrap; }⏎
     <message>
         <location line="+10"/>
         <source>Where:</source>
-        <translation type="unfinished">Όπου:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation> Προειδοποίηση: Οι υπηρεσίες εδώ είναι πειραματικές. Βοηθήστε μας να τις δοκιμάσουμε. 
@@ -569,6 +783,14 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>Κύκλοι</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">GxsForums</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">GxsChannels</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ p, li { white-space: pre-wrap; }
         <translation>Φωτογραφίες</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -633,13 +842,17 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Προσθήκη Άβαταρ</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Μετακινηση</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Ορισμός εικόνας Avatar</translation>
     </message>
@@ -658,6 +871,10 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Μεταφόρτωση μικρογραφίας</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ p, li { white-space: pre-wrap; }
         <translation>Επαναφορά</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished"> Rate ελλειφθει</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Αποστολη Rate</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Παντα μπροστα</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Στιλ</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% Αδιαφανεια</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Αποθήκευση</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Διακοπη</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Από:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Απόκρυψη ρυθμίσεων</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,9 +1063,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
-        <translation type="unfinished">Σχόλιο</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -852,12 +1093,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -885,7 +1126,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -943,7 +1184,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Αναγνωση καταστασης της εναλλαγης μυνηματος</translation>
     </message>
@@ -983,7 +1224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -991,12 +1232,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Μου αρέσει</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Εικονιδιο</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1042,19 +1283,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="-116"/>
         <source>Comment</source>
-        <translation type="unfinished">Σχόλιο</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
@@ -1216,17 +1457,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Κανάλια</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Καρτέλες</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
@@ -1236,17 +1477,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Λήψεις</translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Άνοιγμα κάθε καναλιού σε νέα καρτέλα</translation>
     </message>
@@ -1254,7 +1485,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1508,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Μου αρέσει</translation>
     </message>
@@ -1302,18 +1533,18 @@ into the image, so as to
         <translation type="unfinished">Εικονιδιο</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1328,7 +1559,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1338,7 +1569,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1346,7 +1587,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1537,7 +1778,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Εμφανιση του προθαλαμου συνομιλιων</translation>
     </message>
@@ -1549,6 +1790,22 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Έχετε %1 νέα μηνύματα</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Έχετε %1 νέο μήνυμα</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 νέα μηνύματα</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 νέο μήνυμα</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1570,14 +1827,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Άγνωστη Αίθουσα</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Αφαίρεση Όλων</translation>
     </message>
@@ -1585,13 +1841,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Υπολογισμος</translation>
     </message>
@@ -1601,7 +1857,29 @@ into the image, so as to
         <translation>Θέμα</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1611,7 +1889,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1668,12 +1946,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1683,31 +1961,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Δημιουργια προθαλαμου συνομιλιων</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Δεν υπαρχει κανενα θεμα]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Πληροφοριες επιλεγμενου προθαλαμου συνομιλιων</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Ιδιωτικα</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Δημοσια</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1717,25 +1995,42 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Αναζήτηση στις Αίθουσες Συνομιλίας</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Ανζήτηση Ονόματος</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Εγγεγραμμένος</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Στήλες</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Ναι</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Όχι</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1747,47 +2042,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Θέμα:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Τυπος:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Ασφάλεια:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Ετικετα κειμενου</translation>
     </message>
@@ -1802,24 +2097,13 @@ Double click a chat room to enter and chat.</source>
         <translation>Δεν υπάρχουν ανώνυμες ταυτότητες</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Εμφάνιση</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>στήλη</translation>
@@ -1833,7 +2117,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Απομακρυνση στοιχειου</translation>
     </message>
@@ -1878,7 +2162,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
@@ -1893,7 +2177,19 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Chat Settings</source>
+        <translation type="vanished">Ρυθμισεις συνομιλιων</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Ενεργοποίηση Emoticons Private Chat</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Ενεργοποιηση της ομαδικης συνομιλιας με εικονιδια</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Ενεργοποίηση προσαρμοσμένων γραμματοσειρων</translation>
     </message>
@@ -1902,6 +2198,10 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>Ενεργοποίηση προσαρμοσμένου μέγεθους γραμματοσειρων</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Ελάχιστο μέγεθος γραμματοσειράς</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1913,7 +2213,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Ενεργοποίηση πλάγιας γραφής</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1938,7 +2238,11 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Chat λόμπι</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Αναβοσβήνει το εικονίδιο στηλοθέτη</translation>
     </message>
@@ -1947,6 +2251,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Ιδιωτικη συνομιλια</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1968,7 +2276,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Αναβοσβήνει το εικονίδιο παράθυρου/tab</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Γραμματοσειρά συνομιλίας</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Αλλαγή της γραμματοσειράς της συνομιλίας</translation>
     </message>
@@ -1978,10 +2290,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Γραμματοσειρά συνομιλίας:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Ιστορικό</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Στιλ</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1996,13 +2312,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Ομαδική συνομιλία</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Ιδιωτική συνομιλία</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2072,22 +2392,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2097,17 +2407,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2154,7 +2454,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished">Περιγραφη:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2204,7 +2504,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Μέγιστη περίοδος αποθήκευσης, σε μέρες (0 = κράτα όλα)</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Προκαθορισμένη Αναζήτηση</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Διάκριση πεζών-κεφαλαίων</translation>
     </message>
@@ -2243,6 +2547,10 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Προκαθορισμένη ταυτότητα για της αίθουσες συνομιλίας:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2310,7 +2618,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Εμφάνιση συνομιλίας</translation>
     </message>
@@ -2346,7 +2654,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Κλεισιμο</translation>
     </message>
@@ -2381,12 +2689,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Italic</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2466,6 +2774,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2503,7 +2816,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>γράφει...</translation>
     </message>
@@ -2525,7 +2838,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Θέλετε πραγματικά να διαγράψετε το ιστορικό;</translation>
     </message>
@@ -2575,7 +2888,7 @@ after HTML conversion.</source>
         <translation>Είναι απασχολημένος και δεν μπορεί να απαντήσει</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2597,7 +2910,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Εύρεση Προηγούμενου &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2612,12 +2925,16 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Εύρεση&lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Κατάσταση)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Καθορισμός γραμματοσειράς &amp; χρώματος κειμένου</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Επισύναψη αρχείου</translation>
     </message>
@@ -2633,12 +2950,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Επισήμανση επιλεγμένου κειμένου&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2649,12 +2966,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>στοιχεία βρέθηκαν.</translation>
     </message>
@@ -2674,7 +2991,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Πληκτρολογείστε μήνυμα εδώ</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2700,7 +3017,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Εμφάνιση λεπτομερειών: </translation>
     </message>
@@ -2722,7 +3039,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Προσωπικοί κύκλοι</translation>
     </message>
@@ -2748,7 +3065,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Φίλοι</translation>
     </message>
@@ -2808,7 +3125,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Φίλοι φίλων</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2824,7 +3141,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Κύκλοι</translation>
     </message>
@@ -2876,40 +3193,40 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Σφάλμα:  οι peer λεπτομέρειες δεν μπορουν να παρθουν.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +3236,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Κρυπτογράφηση</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation>Μη συνδεδεμένος</translation>
     </message>
@@ -3001,22 +3318,17 @@ Double click on it to add his name on text writer.</source>
         <translation>κανένας</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Αυτό το πιστοποιητικό περιλαμβάνει:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;η &lt;b&gt;ταυτότητα του κόμβου&lt;/b&gt; και &lt;b&gt;όνομα&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3036,7 +3348,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>με</translation>
     </message>
@@ -3053,16 +3365,104 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Συνδεση με τον οδηγο φιλου</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Προσθήκη νέου φίλου</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp; Μπορείτε να πάρετε ένα αρχείο πιστοποιητικού από το φίλο σας</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;Δημιουργια φίλου με επιλεγμένους φίλους από τους φίλους μου</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Περιλαμβάνουν υπογραφές</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Αντιγράψετε σας Cert πρόχειρο</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Αποθηκεύσετε Cert σας σε ένα αρχείο</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Εκτελέστε το πρόγραμμα ηλεκτρονικού ταχυδρομείου</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Αρχεία πιστοποιητικού</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Χρήση πιστοποιητικών PGP αποθηκευμένα σε αρχεία.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Εισαγωγή πιστοποιητικού φιλων...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Θα πρέπει να δημιουργήσετε ένα αρχείο με το πιστοποιητικό σας και να το δώσετε στο φίλο σας. Επίσης, μπορείτε να χρησιμοποιήσετε ένα αρχείο που δημιουργείται πριν.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Εξαγωγή του πιστοποιητικό μου...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Σύρετε και να ρίξει το πιστοποιητικό τους φίλους σας σε αυτό το παράθυρο ή να καθορίσετε τη διαδρομή στο παρακάτω πλαίσιο</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Περιγραφη</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Φίλοι φίλων</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Τώρα επιλέξτε με ποιούς θέλετε να γίνεται φίλος/η.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Δείξε μου:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Γίνει φίλος με τους συμμαθητές αυτών</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare ID</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Χρήση RetroShare ID για την προσθήκη ενός φίλου που είναι διαθέσιμα στο δίκτυό σας.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Προσθηκη των RetroShare ID...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Επικόλληση τους φίλους eMule ομάδα + Ultra ID στο παρακάτω πλαίσιο</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Εισαγάγετε το RetroShare ID του φίλου σας, π.χ. Peer@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3104,7 +3504,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Πρόσκληση φίλων μέ Email</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Εισαγωγη email διευθύνσεων των φιλων σας (ξεχωριστά τον καθένα με ένα ερωτηματικό)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Η Email διευθυνση των φιλων σας:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Εισαγετε τις Email διευθυνσεις φιλων</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Θέμα:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3120,32 +3540,44 @@ Double click on it to add his name on text writer.</source>
         <translation>Λεπτομέρειες σχετικά με το αίτημα</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Peer λεπτομέρειες</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Όνομα:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Email:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Κόμβος:</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Τοποθεσία:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Επιλογές</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Εισάγεται το πιστοποιητικό χειρονακτικός</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Προσθηκη φίλου στην Ομάδα:</translation>
     </message>
@@ -3155,7 +3587,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Έλεγχος ταυτότητας φίλου (υπογραφη PGP κλειδίου)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3180,22 +3612,16 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Πρόσθηκη ως φίλο-για να συνδεθείτε με</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Για να αποδεχθείε την αίτηση του φίλου, πατήστε το πλαισιο Τέλος.</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Συγγνώμη, εμφανίστηκς κάποιο σφαλμα</translation>
     </message>
@@ -3215,27 +3641,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Λεπτομέρειες σχετικά με τον φίλο σας:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Ισχύς κλειδιού:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Υπογράφοντες</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Αυτός ο ομότιμος είναι ήδη στην λιστα φιλων. Προσθέτοντας μπορεί να ρυθμιστεί μόνο η διεύθυνση ip.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3281,17 +3712,45 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Η φορτωση του πιστοποιητικου απετυχε</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Οι peer λεπτομέρειες του κλειδιου PGP key %1 δεν μπορουν να παρθουν.</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Κάθε φορέα που δεν έχω υπογράψει</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Φίλοι φίλων μου που με εμπιστευονται</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Υπεγράφη συμμαθητές δείχνει όπως αρνήθηκε</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Όνομα ομότιμης οντότητας</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Επίσης υπεγράφη από</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Peer id</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Πρόσκληση RetroShare</translation>
     </message>
@@ -3311,12 +3770,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3324,7 +3783,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3364,7 +3823,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Έχετε ένα αίτημα φίλιας από</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3389,7 +3848,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3399,7 +3858,47 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Η φορτωση του πιστοποιητικου απετυχε: αρχείο %1 δεν βρέθηκε</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Αυτός ο ομότιμος %1 δεν είναι διαθέσιμος στο δίκτυό σας</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Χρήση νέας μορφής πιστοποιητικού (ασφαλέστερη, πιο ισχυρή)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Χρήση παλιάς μορφής πιστοποιητικού (συμβατή)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Αφαιρέση υπογραφων</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">Πρόσκληση RetroShare</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Βοήθεια συνδεσης με φίλο</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Μπορείτε να αντιγράψετε το κείμενο και να το στείλετε σε φίλο σας μέσω email ή με κάποιο άλλον τρόπο</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Σας Cert αντιγράφεται στο Πρόχειρο, πάστα και να το στείλετε στο φίλο σας μέσω email ή κάποιο άλλο τρόπο</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Αποθηκευση ως...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3438,7 +3937,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Κανένας ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Use as direct source, when available</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3448,7 +3951,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Διεύθυνση IP</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3467,13 +3970,33 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Συστάσεις Φίλων</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Μήνυμα:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Προτείνετε φίλους</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Προς</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Παρακαλώ επιλέξτε τουλάχιστον ένα φίλο ως παραλήπτη.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3486,7 +4009,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3521,7 +4044,7 @@ even if you don&apos;t make friends.</source>
         <translation>Πρόσθεση του IP στην λίστα αποδοχής</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3531,7 +4054,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished">[Άγνωστο]</translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3596,7 +4124,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3624,7 +4152,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3634,20 +4162,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Άγνωστη Κατάσταση</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Χωρίς σύνδεση</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3657,14 +4182,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3674,8 +4197,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3700,7 +4222,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3992,7 +4514,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4000,8 +4522,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4011,7 +4532,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Γίνεται αναζήτηση</translation>
     </message>
@@ -4047,12 +4568,12 @@ p, li { white-space: pre-wrap; }
         <translation> Λεπτομέρειες κύκλου</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4072,7 +4593,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>Ταυτότητες</translation>
     </message>
@@ -4092,18 +4613,18 @@ p, li { white-space: pre-wrap; }
         <translation>Φίλτρο</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Ψευδώνυμο</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4118,7 +4639,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Τυπος</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4158,19 +4687,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Ορίστε ένα όνομα για τον κύκλο σας</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Κανένας περιορισμός κύκλου εχει επιλέγθει</translation>
     </message>
@@ -4180,24 +4709,12 @@ p, li { white-space: pre-wrap; }
         <translation>Δεν υπάρχουν περιορισμοί επιλεγμένου Κύκλου</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Άγνωστο]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Προσθηκη</translation>
     </message>
@@ -4207,7 +4724,7 @@ p, li { white-space: pre-wrap; }
         <translation>Αφαίρεση</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Αναζητηση</translation>
@@ -4260,13 +4777,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4285,7 +4802,7 @@ p, li { white-space: pre-wrap; }
         <translation>Δημιουργια μιας ομαδας</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished">Όνομα ομάδας:</translation>
     </message>
@@ -4320,7 +4837,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Νεο ποσταρισμα στο καναλι</translation>
     </message>
@@ -4330,7 +4847,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ποσταρισμα στο καναλι</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4391,11 +4908,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Use Drag and Drop / Add Files button, to Hash new files.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copy/Paste RetroShare links from your shares&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Προσθηκη αρχειου προς επισύναψη</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Προσθηκη εικονιδιου του καναλιού</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Μυνημα</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Θέμα:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4481,17 +5010,17 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4510,18 +5039,17 @@ p, li { white-space: pre-wrap; }⏎
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Το αρχείο εχει προσθέθει και κατακερματίζεται</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Παρακαλείσθε να προσθέσετε ένα θέμα</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Φορτωση εικονιδιου εικονας</translation>
     </message>
@@ -4536,12 +5064,18 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Είστε έτοιμοι να προσθέσετε τα αρχεία που στην πραγματικότητα δεν μοιράζεστε. Είστε βέβαιοι ότι θέλετε να συμβεί αυτό;</translation>
     </message>
@@ -4575,7 +5109,7 @@ p, li { white-space: pre-wrap; }⏎
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Ποσταρισμα μυνηματος στο φορουμ</translation>
     </message>
@@ -4584,6 +5118,10 @@ p, li { white-space: pre-wrap; }⏎
         <source>Forum</source>
         <translation>Φορουμ</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Θέμα:</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4604,8 +5142,8 @@ p, li { white-space: pre-wrap; }⏎
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4624,7 +5162,7 @@ p, li { white-space: pre-wrap; }
         <translation>Μπορείτε να επισυνάψετε αρχεία μέσω drag and drop σε αυτό το παράθυρο</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4654,17 +5192,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Κανενα φόρουμ</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>Απάντηση στον</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Τίτλος</translation>
     </message>
@@ -4717,7 +5255,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Φορτωση αρχειου εικονας</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4727,8 +5265,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4737,6 +5275,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Αποστολη</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4751,7 +5293,23 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Δημιουργια προθαλαμου συνομιλιων</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Ένα chat λόμπι είναι μια αποκεντρωμένη και ανώνυμη συνομιλία ομάδας. Όλοι οι συμμετέχοντες δέχονται όλα τα μηνύματα. Αφού δημιουργηθεί το λόμπι μπορείτε να προσκαλέσετε άλλους φίλους από την καρτέλα &quot;φίλοι&quot;.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Ονομα προθαλαμου:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Θεμα προθαλαμου:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4786,7 +5344,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4796,7 +5354,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4811,7 +5369,11 @@ Do you want to discard this message?</source>
         <translation>Επιλέξτε τους φίλους με τους οποιους θέλετε να κανετε μια ομαδική συζήτηση.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Προσκληση φιλων</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4832,7 +5394,7 @@ Do you want to discard this message?</source>
         <translation>Επαφες:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,17 +5402,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Δημοσιες πληροφοριες</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Ονομα:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Τοπος:</translation>
     </message>
@@ -4860,12 +5422,12 @@ Do you want to discard this message?</source>
         <translation>ID Τοπου:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Έκδοση λογισμικού:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Online από:</translation>
     </message>
@@ -4885,7 +5447,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4895,7 +5462,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Άλλες πληροφορίες</translation>
     </message>
@@ -4905,12 +5472,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Πιστοποιητικό</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4920,7 +5492,11 @@ Do you want to discard this message?</source>
         <translation>Περιλαμβάνουν υπογραφές</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Αποθηκεύστε το κλειδί σε ένα αρχείο</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Εξαγωγή ταυτότητας</translation>
     </message>
@@ -4990,33 +5566,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Ετικετα κειμενου</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5106,7 +5682,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>Β</translation>
     </message>
@@ -5774,7 +6350,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Έναρξη αρχείου</translation>
     </message>
@@ -5782,38 +6358,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>να</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>ανεξαρτήτως πεζών</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>ΑΔ.MM.yyyy</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5821,12 +6397,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Έκφραση Widget</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Διαγράφη αυτής της έκφρασης</translation>
     </message>
@@ -5988,7 +6564,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Εικονα</translation>
     </message>
@@ -5998,7 +6574,7 @@ and use the import button to load it</source>
         <translation>Βιντεο</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Ήχος</translation>
     </message>
@@ -6058,21 +6634,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation>C</translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Καταλογοι φιλων</translation>
     </message>
@@ -6194,7 +6760,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6236,7 +6802,7 @@ and use the import button to load it</source>
         <translation>Εμφάνιση ομάδων</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Ομάδα</translation>
     </message>
@@ -6272,7 +6838,7 @@ and use the import button to load it</source>
         <translation>Προσθηκη σε ομαδα</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Αναζήτηση</translation>
@@ -6288,7 +6854,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6501,7 +7067,7 @@ at least one peer was not added to a group</source>
     <message>
         <location line="+5"/>
         <source>To</source>
-        <translation type="unfinished">Στον</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+34"/>
@@ -6527,7 +7093,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Επιβεβαίωση αίτημα φίλου</translation>
     </message>
@@ -6544,6 +7110,10 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Αναζητηση :</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6565,7 +7135,7 @@ at least one peer was not added to a group</source>
         <translation>Αναζήτηση φίλων</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished">Επισημάνση όλων</translation>
     </message>
@@ -6576,132 +7146,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Δημιουργια φιλου</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Επεξεργασια μήνυματος κατάστασης</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Ραδιοφωνική μετάδοση</translation>
     </message>
@@ -6784,38 +7238,33 @@ Also check your ports!</source>
         <translation>Επαναφορα της προεπιλεγμενης γραμματοσειρας</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Δίκτυο</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6833,17 +7282,7 @@ Also check your ports!</source>
         <translation>Κωδικος</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Τα πεδία είναι υποχρεωτικά με τουλάχιστον 3 χαρακτήρες</translation>
     </message>
@@ -6853,12 +7292,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Υποδοχη</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6879,38 +7323,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6930,12 +7374,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6945,43 +7389,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7025,13 +7464,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7041,7 +7480,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7076,7 +7515,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7086,7 +7525,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7096,7 +7540,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7322,13 +7771,36 @@ and use the import button to load it</source>
         <translation>Ξεκινώντας</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Προσκληση φιλων</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;⏎
+&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;&quot;&gt;This is a list of shared folders. You can add and remove folders using the buttons at the bottom.&lt;/span&gt;&lt;/p&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;&quot;&gt;When you add a new folder, intially all files in that folder are shared.&lt;/span&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory:&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; &lt;/span&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;Browsable&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;: files are browsable from your direct friends.&lt;/span&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;Network Wide&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;: files can be downloaded by anybody through anonymous tunnels.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
+</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Προσθεστε του φιλους σας στο RetroShare</translation>
     </message>
@@ -7338,103 +7810,89 @@ and use the import button to load it</source>
         <translation>Προσθηκη φιλων</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Συνδεθείτε με τους φίλους</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Για προχωρημένους: Ανοιγμα της υποδοχης του Firewall</translation>
-    </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Συνδεθείτε με τους φίλους</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Για προχωρημένους: Ανοιγμα της υποδοχης του Firewall</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Περαιτέρω βοήθεια και υποστήριξη</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Ανοιγμα της RS Ιστοσελιδας</translation>
     </message>
@@ -7459,7 +7917,7 @@ p, li { white-space: pre-wrap; }
         <translation>Email ανατροφοδότηση</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare Προσκληση</translation>
     </message>
@@ -7509,12 +7967,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare ανατροφοδότηση </translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>Υποστηριξη RetroShare</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7638,7 +8096,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Εμφάνιση ομαδικής συνομιλίας</translation>
     </message>
@@ -7646,7 +8104,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Άγνωστο]</translation>
     </message>
@@ -7816,7 +8274,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Τίτλος</translation>
     </message>
@@ -7829,12 +8287,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7859,7 +8317,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort by Name</source>
+        <translation type="vanished">Ταξινόμηση κατά όνομα</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Ταξινόμηση κατά δημοτικότητα</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Ταξινόμηση κατά το τελευταιο ποσταρισμα</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7874,14 +8344,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
-        <translation type="unfinished">Τελευταία Δημοσίευση</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7892,13 +8362,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Δημοτικότητα </translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Εμφάνιση</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7911,7 +8385,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>και</translation>
     </message>
@@ -8047,7 +8521,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Κανάλια</translation>
@@ -8058,22 +8532,22 @@ p, li { white-space: pre-wrap; }
         <translation>Δημιουργία καναλιού</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Ενεργοποίηση αυτόματης λήψης</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Τα κανάλια μου</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Εγγεγραμμένα Κανάλια </translation>
     </message>
@@ -8093,12 +8567,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Απενεργοποίηση της αυτόματης λήψης</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8133,22 +8607,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Παιξιμο</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Άνοιγμα φακέλου</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Σφαλμα</translation>
     </message>
@@ -8168,17 +8642,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Είστε βέβαιοι ότι θέλετε να ακυρώσετε και να διαγράψετε το αρχείο;</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Ο φάκελος δεν ανοίγει</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Αναπαραγωγή αρχείου</translation>
     </message>
@@ -8188,10 +8662,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Το αρχείο %1 δεν υπάρχει στην τοποθεσία.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Φόρμα</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Όνομα αρχείου</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Μέγεθος</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Τίτλος</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Δημοσιεύτηκε</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Κατάσταση</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Δημιουργία Νέου Καναλιού</translation>
     </message>
@@ -8229,19 +8730,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Εγγραφή στο Κανάλι</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8255,7 +8746,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Επέκταση</translation>
     </message>
@@ -8270,7 +8761,7 @@ p, li { white-space: pre-wrap; }
         <translation>Περιγραφή Καναλιού</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Φορτωση</translation>
     </message>
@@ -8285,9 +8776,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
+        <source>New Channel</source>
+        <translation type="vanished">Νέο Κανάλι</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8298,7 +8788,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8319,7 +8809,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Παιξιμο</translation>
     </message>
@@ -8375,24 +8865,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Αρχεία</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Προειδοποίηση! Έχετε λιγότερο από ό, τι ώρες %1 και το %2 λεπτά πριν από αυτό το αρχείο έχει διαγραφεί θεωρούν αποθηκεύοντάς.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Απόκρυψη</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Νέο</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Σχόλιο</translation>
     </message>
@@ -8407,17 +8901,21 @@ p, li { white-space: pre-wrap; }
         <translation>Δεν μου αρέσει</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Φορτωση</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8442,16 +8940,83 @@ p, li { white-space: pre-wrap; }
         <translation>Παιξιμο πολυμεσων</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Ποσταρισμα στο καναλι</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Φορτωση</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Αναζήτηση καναλιών</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Τίτλος</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Αναζήτηση τίτλου</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Μήνυμα</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Αναζήτηση Μηνύματος</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Όνομα αρχείου</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Αναζήτηση Ονόματος Αρχείου</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Δεν υπάρχει επιλεγμένο κανάλι</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Απενεργοποίηση αυτόματης λήψης</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Ενεργοποίηση αυτόματης λήψης</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Εμφάνιση αρχείων</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Feeds</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Αρχεία</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Περιγραφή:</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Ποσταρισμα στο καναλι</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8521,7 +9086,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8557,7 +9122,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8572,13 +9137,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Feeds</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8593,7 +9158,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8608,7 +9173,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8668,22 +9233,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8758,13 +9313,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Εγγεγραμμένος</translation>
     </message>
@@ -8796,7 +9350,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+59"/>
         <source>Disable Auto-Download</source>
-        <translation type="unfinished">Απενεργοποίηση της αυτόματης λήψης</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
@@ -8815,17 +9369,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8940,7 +9494,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Σχόλιο </translation>
     </message>
@@ -8953,7 +9507,7 @@ p, li { white-space: pre-wrap; }
         <translation>Φόρμα</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8983,7 +9537,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ανανέωση</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Σχόλιο</translation>
@@ -9022,7 +9576,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Απάντηση στο σχόλιο</translation>
     </message>
@@ -9046,21 +9600,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Ψηφίστε κάτω</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9070,7 +9609,7 @@ p, li { white-space: pre-wrap; }
         <translation>Δημιουργια σχολιου</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9099,10 +9638,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Υπογράφεται από</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9130,7 +9685,7 @@ before you can comment</source>
         <translation>Πρέπει να δημιουργήσετε μια ταυτότητα για να μπορείτε να σχολιάσετε</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9181,7 +9736,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Εγγραφείτε στο φόρουμ</translation>
     </message>
@@ -9197,7 +9752,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -9217,9 +9772,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Φορτωση</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9250,13 +9804,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Θέμα: </translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Διαγραφείτε από το φόρουμ</translation>
     </message>
@@ -9267,7 +9821,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -9287,17 +9841,21 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Φορτωση</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Απόκρυψη</translation>
     </message>
@@ -9310,66 +9868,63 @@ before you can comment</source>
         <translation>Φόρμα</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Έναρξη νέας μηνυματοσειράς στο επιλεγμενο φόρουμ</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Αναζήτηση στα φόρουμ</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Τελευταιο ποστ</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished">Νέο θεμα</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Περασμένη κλωστή άποψη</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Επίπεδη προβολή</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Τίτλος</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Δημιουργος</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Φορτωση</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9379,7 +9934,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Μήνυμα απάντησης</translation>
     </message>
@@ -9403,6 +9963,10 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Λήψη όλων των αρχείων</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Επόμενο μη αναγνωσμένο</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9419,23 +9983,31 @@ before you can comment</source>
         <translation>Αναζήτηση συγγραφέα</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Περιεχόμενο</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Αναζήτηση περιεχομένου</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Δεν υπάρχει όνομα</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Απάντηση</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9478,12 +10050,16 @@ before you can comment</source>
         <translation>Αντιγραφη του Λινκ</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Απόκρυψη</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Επεκταση</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9513,8 +10089,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9528,6 +10104,22 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Ανώνυμος</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">υπέγραψε</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">κανένας</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Λείπει ενα μήνυμα...]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9597,12 +10189,12 @@ before you can comment</source>
         <translation>Αρχικό μήνυμα</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">Επεξεργασία</translation>
     </message>
@@ -9663,7 +10255,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9683,7 +10275,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9735,7 +10327,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9745,7 +10337,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9760,7 +10352,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9826,12 +10418,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Φόρουμ</translation>
@@ -9862,16 +10454,35 @@ This message is missing. You should receive it later.</source>
         <translation>Άλλα φόρουμ</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Αναμονή</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Ανάκτηση</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Φορτωση</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Προσθήκη εικονίδιου</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Οι βασικοι αποδέκτες μπορουν να δημοσιεύουν σε περιορίσμενοι ομαδα και μπορουν να βλεπουν και να δημοσιεύουν ιδιωτικόυ ΤΥΠΟΥ καναλια</translation>
     </message>
@@ -9880,14 +10491,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Μοιρασμα δημοσιου κλειδίου</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">Ελέγξτε τους ομοτυμους που θα θέλατε να μοιραστείτε το ιδιωτικο σας κλειδι δημοσιευσης</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Μοιρασμα κλειδιου με</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Μήνυμα διανομής</translation>
     </message>
@@ -9895,7 +10514,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Δημοσια</translation>
     </message>
@@ -9914,6 +10533,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Νέο θεμα</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Απαιτείται</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Κρυπτογραφημένα μηνύματα</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9955,7 +10582,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished">Σχόλια:</translation>
     </message>
@@ -9978,7 +10605,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,12 +10621,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10016,23 +10643,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10048,28 +10675,22 @@ This message is missing. You should receive it later.</source>
         <translation>Προσθέστε ένα όνομα</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Λογότυπο ομάδας φόρτωσης</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10079,12 +10700,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Πληροφορίες</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10094,7 +10715,7 @@ This message is missing. You should receive it later.</source>
         <translation>Τελευταία Δημοσίευση</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10169,12 +10790,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Δημοτικότητα </translation>
     </message>
@@ -10190,22 +10806,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Δημιουργος</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>GxsIdLabel</translation>
     </message>
@@ -10213,7 +10834,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Φορτωση</translation>
     </message>
@@ -10273,7 +10894,7 @@ This message is missing. You should receive it later.</source>
         <translation>Επεξεργασία Λεπτομερειών</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10330,12 +10951,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Αντιγραφή του RetroShare Συνδέσμου</translation>
     </message>
@@ -10358,7 +10979,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Καμία υπογραφή</translation>
     </message>
@@ -10371,14 +10992,22 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Φορτωση</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Δεν βρέθηκε</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Καμία υπογραφή </translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10388,7 +11017,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10398,12 +11027,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10423,14 +11047,6 @@ This message is missing. You should receive it later.</source>
         <translation>[Άγνωστο]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10442,7 +11058,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10490,13 +11106,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Άγνωστο]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Φορτωση</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10877,7 +11497,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10893,7 +11513,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Δημιουργοι</translation>
     </message>
@@ -10912,7 +11532,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10992,7 +11612,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +11622,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11030,7 +11650,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11040,7 +11660,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Αντιγράψετε σας Cert πρόχειρο</translation>
     </message>
@@ -11050,7 +11670,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Αποθηκεύσετε Cert σας σε ένα αρχείο</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11070,37 +11690,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11112,12 +11708,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11132,7 +11728,12 @@ new short format</source>
         <translation type="unfinished">Πρόσκληση RetroShare</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11397,14 +11998,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Όλα</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Φήμη</translation>
     </message>
@@ -11414,12 +12015,12 @@ p, li { white-space: pre-wrap; }
         <translation>Αναζητηση</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Δημιουργια νέας ταυτότητας</translation>
     </message>
@@ -11429,7 +12030,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11444,27 +12045,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished">Κλεισιμο</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11480,39 +12081,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Κύκλοι</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11532,20 +12123,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Προσωπικοί κύκλοι</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Επεξεργασία Ταυτότητας</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Διαγραφή Ταυτότητας</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11555,78 +12144,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Αποστολή μηνύματος </translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Τυπος:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>Η άποψή σας:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Αρνητικό</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11637,17 +12226,17 @@ p, li { white-space: pre-wrap; }
         <translation>Θετικό</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Ανώνυμος</translation>
     </message>
@@ -11662,24 +12251,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11694,12 +12283,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11709,7 +12293,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11784,7 +12368,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11814,7 +12398,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Άγνωστο</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11829,7 +12413,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11877,7 +12461,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11885,7 +12469,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11928,7 +12512,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12008,7 +12592,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12024,12 +12608,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12134,7 +12723,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12184,21 +12773,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Το άβατάρ σας</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12208,7 +12797,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12223,7 +12812,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12238,12 +12827,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12263,12 +12852,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12278,7 +12867,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12286,7 +12875,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Ψευδώνυμο</translation>
     </message>
@@ -12316,13 +12905,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Ψευδώνυμο</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation>Νέα ταυτότητα</translation>
     </message>
@@ -12336,7 +12919,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12346,12 +12929,7 @@ These identities will soon be not supported anymore.</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Επεξεργασία Ταυτότητας </translation>
@@ -12362,27 +12940,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12402,7 +12980,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12412,18 +12990,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12433,7 +13005,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12443,7 +13020,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12453,15 +13030,10 @@ These identities will soon be not supported anymore.</source>
         <translation>Τυπος</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Μετακινηση</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12487,7 +13059,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Προσθηκη</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12497,13 +13069,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Το άβατάρ σας</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12513,7 +13085,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12587,7 +13159,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Αντίγραφη</translation>
     </message>
@@ -12597,12 +13169,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Μετακινηση</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Επισημάνση όλων</translation>
     </message>
@@ -12621,38 +13193,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Απόσπασμα</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Αποστολη</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12670,32 +13230,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Υποδοχη:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Κατασταση:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12716,12 +13271,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12730,31 +13280,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Άνοιγμα αρχείου</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Άνοιγμα φακέλου</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Έλεγχος...</translation>
     </message>
@@ -12764,7 +13309,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Ελέγχος αρχειων</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12792,7 +13337,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Προσθήκη φίλου</translation>
     </message>
@@ -12808,8 +13353,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Επιλογές</translation>
     </message>
@@ -12830,7 +13374,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Αποχωρηση</translation>
     </message>
@@ -12841,12 +13385,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Οδηγός γρήγορης έναρξης</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>Το RetroShare %1 ειναι μια πλατφόρμα ασφαλούς αποκεντρωμένης επικοινωνίας</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Ημιτελής</translation>
     </message>
@@ -12875,12 +13419,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Κατασταση</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Κοινοποιηση</translation>
     </message>
@@ -12891,35 +13434,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Ανοιγμα μυνηματων</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Διάγραμμα εύρους ζώνης</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Εφαρμογές</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Βοήθεια</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Ελαχιστοποίηση</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Μεγιστοποίηση</translation>
     </message>
@@ -12934,12 +13473,7 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>νέο μήνυμα %1</translation>
     </message>
@@ -12969,7 +13503,7 @@ These identities will soon be not supported anymore.</source>
         <translation>%1 φίλοι που συνδέονται</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Θέλετε πραγματικά να αποχωρησετε απο το  RetroShare ? </translation>
     </message>
@@ -12989,7 +13523,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Εμφανιση</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Βεβαιωθείτε ότι αυτή η σύνδεση δεν σφυρηλατήθηκε για να σας σύρει σε μια κακόβουλη ιστοσελίδα.</translation>
     </message>
@@ -13034,13 +13568,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Στατιστικές</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13055,7 +13588,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13064,17 +13597,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Συνθέση</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Επαφές</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Παράγραφος</translation>
     </message>
@@ -13110,12 +13643,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Επικεφαλιδα 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Μέγεθος γραμματοσειράς</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Αύξηση μεγέθους γραμματοσειράς</translation>
     </message>
@@ -13130,32 +13663,32 @@ These identities will soon be not supported anymore.</source>
         <translation>Bold</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Italic</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Ευθυγράμμιση</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Προσθέστε μια εικόνα</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Ορίζει κώδικα στυλ γραμματοσειράς κειμένου</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Υπογράμμιση </translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Θέμα:</translation>
     </message>
@@ -13166,32 +13699,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Καθορίστε το χρώμα του κειμένου</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Συνιστάμενα αρχεία</translation>
     </message>
@@ -13261,7 +13794,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Προσθέστε Blockquote</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Αποστολή σε:</translation>
     </message>
@@ -13301,7 +13834,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Γεια σας, &lt;br&gt;θα ήθελα να σαςσυστήσω ένα καλό φίλο μου, μπορείτε να τον εμπιστευθείτε πάρα πολύ όταν μπορείτε και με εμπιστεύεσται. &lt;br&gt;</translation>
     </message>
@@ -13321,18 +13854,18 @@ These identities will soon be not supported anymore.</source>
         <translation>θέλει να είναι φίλος μαζί σας στο RetroShare</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Γεια σου % 1, &lt;br&gt;&lt;br&gt;%2 θέλει να είναι φίλοι μαζί σας σχετικά στο RetroShare.&lt;br&gt;&lt;br&gt;Απάντηση τώρα: &lt;br&gt;%3 &lt;br&gt;&lt;br&gt;ευχαριστώ, &lt;br&gt;η ομάδα του   RetroShare </translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Αποθηκεύση μυνηματος</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Μήνυμα δεν έχει σταλεί.
@@ -13344,17 +13877,7 @@ Do you want to save message to draft box?</source>
         <translation>Επικολληση του Λινκ</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Προσθηκη του &quot;Σε&quot;</translation>
     </message>
@@ -13374,7 +13897,7 @@ Do you want to save message to draft box?</source>
         <translation>Προσθήκη ως προτείνομενο</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Αυθεντικο μήνυμα</translation>
     </message>
@@ -13384,21 +13907,21 @@ Do you want to save message to draft box?</source>
         <translation>Απο</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Στον</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Σταλθηκε</translation>
     </message>
@@ -13413,7 +13936,7 @@ Do you want to save message to draft box?</source>
         <translation>Στις % 1, %2 έγραψε:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13423,30 +13946,30 @@ Do you want to save message to draft box?</source>
         <translation>Fwd:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Θέλετε να στείλετε το μήνυμα χωρίς υποκείμενο;</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Παρακαλώ εισάγετε τουλάχιστον έναν παραλήπτη.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Άγνωστο</translation>
     </message>
@@ -13561,13 +14084,13 @@ Do you want to save message to draft box?</source>
         <translation>Λεπετομέρειες</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Ανοιγμα αρχειου...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Αρχεία HTML (*.htm * .html)??Όλα τα αρχεία (*)</translation>
     </message>
@@ -13587,7 +14110,7 @@ Do you want to save message to draft box?</source>
         <translation>Εξαγωγή PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Μήνυμα δεν έχει σταλεί.
@@ -13609,7 +14132,7 @@ Do you want to save message ?</source>
         <translation>Προσθηκη επιπλεον αρχειου</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13639,18 +14162,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Κλεισιμο</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Από:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13690,13 +14213,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Ευχαριστούμε, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13706,12 +14229,12 @@ Do you want to save message ?</source>
         <translation>[Λείπει]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13789,7 +14312,7 @@ Do you want to save message ?</source>
         <translation>Προεπιλογή</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Μια νέα καρτέλα</translation>
     </message>
@@ -13799,7 +14322,7 @@ Do you want to save message ?</source>
         <translation>Ένα νέο παράθυρο</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Επεξεργασια ετικέτας</translation>
     </message>
@@ -13822,7 +14345,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Θεμα:</translation>
     </message>
@@ -13830,7 +14353,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Μυνημα</translation>
     </message>
@@ -13858,7 +14381,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Συνιστάμενα αρχεία</translation>
     </message>
@@ -13868,37 +14391,37 @@ Do you want to save message ?</source>
         <translation>Λυψη ολων των συνιστωμενων αρχειων</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Θέμα:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Από:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Σε:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>CC:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>BCC:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Ετικέτες:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Απάντηση</translation>
     </message>
@@ -13938,7 +14461,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13982,7 +14505,7 @@ Do you want to save message ?</source>
         <location line="+5"/>
         <location line="+3"/>
         <source>Buttons Text Beside Icon</source>
-        <translation type="unfinished">Πλαισια κειμένου δίπλα από το εικονίδιο</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -13990,7 +14513,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Επιβεβαιώσει %1 ως φίλο</translation>
     </message>
@@ -14000,12 +14523,12 @@ Do you want to save message ?</source>
         <translation>Προσθήκη %1 ως φίλος</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Χωρις θεμα</translation>
     </message>
@@ -14015,22 +14538,17 @@ Do you want to save message ?</source>
         <translation>Λυψη</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14039,24 +14557,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Λυψη ολων</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Εκτύπωση εγγράφου</translation>
     </message>
@@ -14071,12 +14579,12 @@ Do you want to save message ?</source>
         <translation>Αρχεία HTML (*.htm * .html)??Όλα τα αρχεία (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14098,6 +14606,42 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Συνθέση</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Απαντήση σε επιλεγμένο μήνυμα</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Απάντηση</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Απάντηση όλα σε επιλεγμένο μήνυμα</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Απάντηση σε όλους</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Προώθηση του επιλεγμένου μηνύματος</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Προς τα εμπρός</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Κατάργηση του επιλεγμένου μηνύματος</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Διαγραφη</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Εκτύπωση επιλεγμένου μηνύματος</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14176,7 +14720,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Νέο μήνυμα</translation>
     </message>
@@ -14186,16 +14730,60 @@ Do you want to save message ?</source>
         <translation>Συνθέση</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Απαντήσετε σε επιλεγμένο μήνυμα</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Απάντηση</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Απάντηση όλα σε επιλεγμένο μήνυμα</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Απάντηση σε όλους</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Προώθηση του επιλεγμένου μηνύματος</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Foward</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Κατάργηση του επιλεγμένου μηνύματος</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Διαγραφη</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Εκτύπωση επιλεγμένου μηνύματος</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Εκτυπωση</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Οθονη</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>&quot;Εισερχόμενα&quot;</translation>
@@ -14225,17 +14813,21 @@ Do you want to save message ?</source>
         <translation>Σκουπίδια</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Συνολικός φάκελος&quot;Εισερχόμενα&quot;:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Φάκελοι</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>ΠΡΟΒΟΛΗ</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Εκτύπωση...</translation>
@@ -14245,6 +14837,26 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>Προεπισκόπηση εκτύπωσης</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Κουμπιά εικόνα μόνο</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Κουμπιά κειμένου δίπλα από το εικονίδιο</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Πλαισια με κείμενο</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Πλαισια κειμένου κάτω από το εικονίδιο</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Ορισμός κειμένου κάτω από το εικονίδιο</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14266,7 +14878,7 @@ Do you want to save message ?</source>
         <translation>Μήνυμα προς τα εμπρός</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Θέμα:</translation>
     </message>
@@ -14276,7 +14888,7 @@ Do you want to save message ?</source>
         <translation>Απο</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
@@ -14286,7 +14898,39 @@ Do you want to save message ?</source>
         <translation>Περιεχόμενο</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με συνημμένα</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με θέμα</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Κάντε κλικ για να ταξινομήσετε από read</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε από από</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Κάντε κλικ για να ταξινομήσετε κατά ημερομηνία</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με ετικέτες</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με αστέρι</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Προώθηση του επιλεγμένου μηνύματος</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Θέμα αναζήτησης</translation>
     </message>
@@ -14295,11 +14939,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Αναζήτηση από</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14326,14 +14965,14 @@ Do you want to save message ?</source>
         <translation>Αναζήτηση συνημμένων</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Πρωταγωνίστησε</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14407,7 +15046,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14421,7 +15060,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14436,33 +15075,34 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Σχέδια</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Στον</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Δεν ειναι διαθέσιμα μηνύματα με αστέρι. Τα Αστέρια σας αφήνουν να δώσει μηνύματα, ένα ειδικό καθεστώς για να τους διευκολύνετε την εύρεση. Για να πρωταγωνιστήσει ένα μήνυμα, κάντε κλικ στο φως γκρι αστέρι δίπλα σε κάθε μήνυμα.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Χωρίς σύστημα μηνύματα διαθέσιμα.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Στον</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Κάντε κλικ στο κουμπί για να ταξινομήσετε με βάση να</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14470,6 +15110,10 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Σύνολο:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Μηνύματα</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14497,17 +15141,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14561,7 +15195,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -14571,7 +15205,7 @@ Do you want to save message ?</source>
         <translation>Απομακρυνση στοιχειου</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished">από</translation>
     </message>
@@ -14606,7 +15240,7 @@ Do you want to save message ?</source>
         <translation>Msg σε εκκρεμότητα</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Αποκρυψη</translation>
     </message>
@@ -14747,7 +15381,7 @@ Do you want to save message ?</source>
         <translation>Peer  ID</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Κατάργηση αχρησιμοποίητων κλειδιών...</translation>
     </message>
@@ -14757,7 +15391,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Εκκαθαριση κλειδοθήκης</translation>
     </message>
@@ -14775,13 +15409,7 @@ Notes: Your old keyring will be backed up.
 Η αφαίρεση μπορεί να αποτύχει κατά την εκτέλεση πολλαπλών Retroshare παρουσίων στο ίδιο μηχάνημα.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Πληροφορίες κλειδοθήκων</translation>
@@ -14817,13 +15445,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Ασυνέπεια δεδομένων στην κλειδοθήκη. Αυτό είναι πιθανότατα ένα bug. Επικοινωνήστε με τους προγραμματιστές.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Αναζήτηση ονόματος</translation>
     </message>
@@ -14833,18 +15466,25 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Δίκτυο</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14871,7 +15511,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14892,7 +15532,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Ομαδες</translation>
     </message>
@@ -14922,19 +15562,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14944,12 +15584,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14959,7 +15599,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Ομάδα</translation>
     </message>
@@ -15074,7 +15714,7 @@ Reported error:</source>
         <translation type="unfinished">Σύμπτυξη όλων</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15084,7 +15724,7 @@ Reported error:</source>
         <translation type="unfinished">Θέλετε να διαγραψετε αυτόν τον φίλο?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Έγινε!</translation>
@@ -15193,7 +15833,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15208,7 +15848,11 @@ at least one peer was not added to a group</source>
         <translation>Μετακινηση ολων</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Αυτό είναι μια δοκιμη.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15218,12 +15862,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15278,6 +15922,10 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Ιστολογια</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Ασφαλεια</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15299,6 +15947,10 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Μυνημα</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Συνδέση προσπάθειας</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15452,6 +16104,10 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Feed</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15461,7 +16117,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15481,12 +16137,12 @@ at least one peer was not added to a group</source>
         <translation>Λάθος κωδικός!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Μη καταγεγραμμένου plugin/εκτελέσιμο</translation>
     </message>
@@ -15501,7 +16157,19 @@ at least one peer was not added to a group</source>
         <translation>Παρακαλώ ελέγξτε το ρολόι του συστήματός σας.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Εξέταση κοινόχρηστων αρχείων...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Κατακερματισμος αρχείου</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Αποθήκευση αρχείου ευρετηρίου...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Δοκιμή</translation>
     </message>
@@ -15512,19 +16180,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Άγνωστος τίτλος</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Κρυπτογραφημένο μήνυμα</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15532,7 +16198,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Φίλος Online</translation>
     </message>
@@ -15584,6 +16250,10 @@ Low Traffic: 10% standard traffic and TODO: pauses all file-transfers</translati
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Διαλόγος</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15674,12 +16344,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15688,6 +16353,10 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Υπογραφη PGP κλειδίου</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15724,7 +16393,12 @@ p, li { white-space: pre-wrap; }
         <translation>Περιλαμβάνουν υπογραφές</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Επιλογές</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15770,21 +16444,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Σφάλμα:  οι peer λεπτομέρειες δεν μπορουν να παρθουν.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Ο παρεχόμενος αλγόριθμος κλειδιού δεν υποστηρίζεται από το RetroShare⏎ (κλειδιά RSA μόνο υποστηρίζονται προς το παρόν)</translation>
@@ -15802,7 +16476,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15871,6 +16545,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Μαλλον ο κωδικος ειναι λαθος</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15878,12 +16556,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15909,7 +16587,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Συνομιλια</translation>
     </message>
@@ -15930,7 +16608,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Απομακρυνση στοιχειου</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Ονομα:</translation>
     </message>
@@ -15970,7 +16648,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Εισαγωγη μυνηματος</translation>
     </message>
@@ -15984,6 +16662,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Φίλος συνδεθηκε</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Συνδέση προσπάθειας</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16022,13 +16704,17 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished">Άγνωστο</translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Άγνωστο Peer</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Αποκρυψη</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Αποστολή Μηνύματος</translation>
     </message>
@@ -16195,6 +16881,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Φορμα</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16202,11 +16895,23 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Φωτογραφία</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Ετικετα κειμενου</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Σχολιο</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Περίληψη</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16267,6 +16972,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Προσθήκη σχολίου</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Γράψτε ένα σχόλιο...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16337,6 +17050,10 @@ p, li { white-space: pre-wrap; }⏎
         <source>Create Album</source>
         <translation>Δημιουργία άλμπουμ</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Εμφανιση άλμπουμ</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16358,17 +17075,17 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Προβολή διαφανειών</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Τα αλμπουμ μου</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Εγγεγραμμένα Αλμπουμ</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Κοινόχρηστα άλμπουμ</translation>
     </message>
@@ -16397,7 +17114,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Όνομα άλμπουμ</translation>
     </message>
@@ -16456,19 +17173,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16504,12 +17221,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Ετικετα κειμενου</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Εμφανιση περισσότερων λεπτομέρειων σχετικά με αυτό το plugin</translation>
     </message>
@@ -16655,6 +17372,41 @@ p, li { white-space: pre-wrap; }⏎
         <source>Plugin look-up directories</source>
         <translation>Plugin look-up καταλόγους</translation>
     </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Δεν περεχετε αριθμός API. Παρακαλώ διαβάστε το εγχειρίδιο ανάπτυξης plugin.</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Δεν παρεχετε αριθμός SVN. Παρακαλώ διαβάστε το εγχειρίδιο ανάπτυξης plugin.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Σφάλμα φόρτωσης.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Λείπει το σύμβολο. Λάθος έκδοση;</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Κανένα αντικείμενο plugin</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Plugins είναι φορτωμένο.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Άγνωστη κατάσταση.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Ελέγξτε αυτό για την ανάπτυξη των plugins. Αυτοί δεν θα ελεγχθεί για τον κατακερματισμό. Ωστόσο, υπό κανονικές συνθήκες, έλεγχος hash σας προστατεύει από κακόβουλη συμπεριφορά του δημιουργημένο plugins.</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16724,27 +17476,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Ορισμός παράθυρο στην κορυφή</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16797,7 +17534,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16817,8 +17554,8 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16843,13 +17580,13 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
-        <translation type="unfinished">Σχόλιο</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16877,12 +17614,20 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Υπογράφεται από: </translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Σημειώσεις</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16897,22 +17642,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Φορτωση αρχειου εικονας</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16928,17 +17663,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16948,7 +17673,15 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Υποβάλει θέσης</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Υποβολη</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Παρακαλώ προσθέστε Τίτλο</translation>
     </message>
@@ -16968,22 +17701,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16998,7 +17721,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Δημοσίευση ως</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17009,7 +17732,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Εικόνα</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17019,7 +17742,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Τίτλος</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Σύνδεσμος</translation>
     </message>
@@ -17027,12 +17750,32 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Δημοσιεύθηκε συνδέσεις</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Τα θέματα μου</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Εγγεγραμμένα θέματα</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Δημοφιλής θέματα</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Άλλα θέματα</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17066,7 +17809,27 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Το θεμα καταχωρήθηκε </translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Προσθήκη θέματων διαχειριστων</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Επιλέξτε το θέμα Admins</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Δημιουργήστε Νέο Θέμα</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Επεξεργασία Θέματος</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17104,17 +17867,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17130,7 +17883,7 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -17145,17 +17898,16 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Loading</source>
+        <translation type="vanished">Φορτωση</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17168,18 +17920,22 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Τοποθεσία</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Σχολια</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17190,12 +17946,12 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Σχόλιο</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17205,7 +17961,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17215,17 +17971,21 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Ορισμος ως αναγνωσμένο και κατάργηση στοιχείου</translation>
     </message>
@@ -17235,7 +17995,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Νεο</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17245,7 +18005,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17286,10 +18046,69 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Φορτωση</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Από</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Φορμα</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Ζεστό</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Νεο</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Κορυφή</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Σήμερα</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Χθες</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Αυτή την εβδομάδα</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Αυτό το μήνα</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Φέτος</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Επόμενο</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Δημιουργήστε ή επιλέξτε ένα Id υπογραφής πριν από την ψηφοφορία</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Προηγούμενη</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17309,17 +18128,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17329,15 +18138,15 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">Άγνωστο</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17347,42 +18156,42 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">Δημοσιεύσεις</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17402,7 +18211,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Ζεστό</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17432,17 +18241,17 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17457,17 +18266,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17477,31 +18281,27 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Επεξεργασία</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17516,7 +18316,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Εγγραφη</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17590,16 +18390,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>No Channel Selected</source>
         <translation type="unfinished">Δεν υπάρχει επιλεγμένο κανάλι</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17621,6 +18411,10 @@ p, li { white-space: pre-wrap; }⏎
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Καταχωρήθηκε</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17689,16 +18483,16 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Διαχειριστης προφιλ</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17806,7 +18600,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Επεξεργασια μήνυματος κατάστασης</translation>
@@ -17822,7 +18616,7 @@ and use the import button to load it</source>
         <translation>Διαχειριστης προφιλ</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Δημοσιες πληροφοριες</translation>
     </message>
@@ -17857,12 +18651,12 @@ and use the import button to load it</source>
         <translation>Online από:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Άλλες πληροφορίες</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Η διεύθυνσή μου</translation>
     </message>
@@ -17906,27 +18700,51 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Καταχώρηση από:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Λογαριασμός 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Λογαριασμος 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Λογαριασμός 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Προσθηκη στο Pulse</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">φίλτρο</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">URL αθροιστής</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Εμφάνιση ως</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17936,12 +18754,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Από:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17971,13 +18789,13 @@ and use the import button to load it</source>
         <translation type="unfinished">Αρνητικό</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17989,22 +18807,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18013,13 +18821,17 @@ and use the import button to load it</source>
         <source>Cancel</source>
         <translation>Διακοπη</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Θέση παλμό για σύρμα</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18034,24 +18846,34 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Φορτωση αρχειου εικονας</translation>
+        <source>From</source>
+        <translation type="vanished">Απο</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Ημερομηνία</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18062,7 +18884,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18081,7 +18903,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18091,7 +18913,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18118,7 +18940,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18128,7 +18950,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18148,7 +18970,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18264,7 +19086,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18272,42 +19094,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18339,7 +19156,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18347,8 +19164,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Επιβεβαίωση</translation>
     </message>
@@ -18618,12 +19435,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Peer λεπτομέρειες</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Ακυρώθηκε η αίτηση αρχειου</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Αυτή η έκδοση του RetroShare χρησιμοποιεί το OpenPGP-SDK. Ως παρενέργεια, δεν χρησιμοποιεί το κοινό σύστημα διαχείρισης κλειδιών του PGP, αλλά έχει είναι δική ΜΠΡΕΛΟΚ συμμερίζονται όλες οι παρουσίες RetroShare. &lt;br&gt;&lt;br&gt;Δεν φαίνεται να έχουν ένα τέτοιο μπρελόκ, αν και τα κλειδιά του PGP αναφέρονται από τους υπάρχοντες λογαριασμούς eMule ομάδα + Ultra, πιθανώς επειδή έχετε αλλάξει μόνο σε αυτήν την νέα έκδοση του λογισμικού.</translation>
     </message>
@@ -18654,7 +19471,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Παρουσιάστηκε μη αναμενόμενο σφάλμα. Παρακαλούμε να το αναφέρετε» RsInit::InitRetroShare απροσδόκητη επιστροφή κωδικός % 1».</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18688,7 +19505,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Πολλές εμφανίσεις</translation>
@@ -18709,26 +19526,6 @@ The error reported is:&quot;</source>
         <translation>Παρουσιάστηκε μη αναμενόμενο σφάλμα όταν το Retroshare προσπάθησε να αποκτήσει το μόνο παράδειγμα κλείδωμα κλειδωμένο αρχείο:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18808,7 +19605,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18818,7 +19615,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>ενεργοποιημένο</translation>
     </message>
@@ -18828,7 +19625,7 @@ Reported error is:
         <translation>απενεργοποιημένο</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18844,7 +19641,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>%1 δευτερόλεπτα πριν</translation>
     </message>
@@ -18911,7 +19708,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18939,7 +19736,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19119,29 +19916,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19334,6 +20115,10 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Αυτό το πιστοποιητικό περιλαμβάνει:</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19384,18 +20169,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19560,7 +20333,7 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Δίκτυο ευρείας</translation>
     </message>
@@ -19734,7 +20507,7 @@ p, li { white-space: pre-wrap; }
         <translation>Φορμα</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19747,7 +20520,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19920,22 +20693,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19943,12 +20706,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20638,7 +21401,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20759,7 +21522,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20779,7 +21542,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20835,7 +21598,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20849,6 +21612,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[Άγνωστο]</translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Λείπει ενα μήνυμα...]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20862,11 +21630,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished">Στον</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20889,18 +21652,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Κάντε κλικ για να ταξινομήσετε από read</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Κάντε κλικ στο κουμπί για να ταξινομήσετε από από</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20923,9 +21681,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20946,7 +21702,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Επαναφέρει όλα της αποθηκευμένα ρυθμίσεις της RetroShare. </translation>
     </message>
@@ -21007,7 +21763,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ορίζει το eMule ομάδα + Ultra του γλώσσα.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Δεν είναι δυνατή η ανοιχτό αρχείο καταγραφής &apos;% 1&apos;: %2</translation>
     </message>
@@ -21028,7 +21784,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21058,7 +21814,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21076,7 +21832,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21093,12 +21849,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Εισάγετε μια λέξη-κλειδί εδώ (τουλάχιστον 3 char μακρά)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Έναρξη αναζήτησης</translation>
     </message>
@@ -21159,7 +21915,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Εκκαθαριση</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Λέξεις-κλειδιά</translation>
     </message>
@@ -21174,7 +21930,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Αναγνωριστικό αναζήτησης</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Όνομα αρχείου</translation>
     </message>
@@ -21274,23 +22030,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Λυψη επιλεγμενου</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Ονομα αρχειου</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Λυψη</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Αντιγραφη του Λινκ</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Αποστολη ενος RetroShare λινκ</translation>
     </message>
@@ -21300,7 +22056,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Λυψη ανακοίνωσης</translation>
     </message>
@@ -21337,7 +22093,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Μετακινηση ολων</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Φάκελος</translation>
@@ -21348,17 +22104,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Νέα RetroShare Λινκ(s)</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Άνοιγμα Φακέλου</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Δημιουργία Συλλογής ...</translation>
     </message>
@@ -21378,7 +22134,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Λυψη απο συλλογη αρχειων...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Συλλογή</translation>
     </message>
@@ -21386,7 +22142,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Peer λεπτομέρειες</translation>
     </message>
@@ -21402,22 +22158,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Απομακρυνση στοιχειου</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>Διεύθυνση IP:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Peer ID:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Τοπος:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21434,7 +22190,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Αποκρυψη</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21459,8 +22215,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21468,7 +22224,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>θέλει να είναι φίλος μαζί σας στο RetroShare</translation>
     </message>
@@ -21499,7 +22255,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Επεκταση</translation>
     </message>
@@ -21544,12 +22300,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Κατασταση:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Εισαγωγη μυνηματος</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Συνδέστε την προσπάθεια</translation>
     </message>
@@ -21569,22 +22325,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Άγνωστο (εξερχόμενη) σύνδεση προσπάθεια</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Αγνωστο θεμα ασφαλειας</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">Άγνωστο</translation>
     </message>
@@ -21594,7 +22345,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Άγνωστο Peer</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Αποκρυψη</translation>
     </message>
@@ -21604,7 +22359,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Θέλετε να διαγραψετε αυτόν τον φίλο?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21614,12 +22369,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21678,12 +22433,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Τοπική διεύθυνση</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21704,22 +22459,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Υποδοχη:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Τοπικό δίκτυο</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Αναζητηση εξωτερικής ip διεύθυνσης </translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Γνωστα / προηγούμενα IPs:</translation>
     </message>
@@ -21732,16 +22487,21 @@ behind a firewall or a VPN.</source>
         <translation>Εάν καταργήσετε την επιλογή αυτή, το RetroShare μπορεί να καθορίσει μόνο IP σας όταν συνδέεστε σε κάποιον. Αφήνοντας αυτό ελέγχεται βοηθά τη σύνδεση όταν έχετε μερικούς φίλους. Βοηθά επίσης εάν είστε πίσω από ένα τείχος προστασίας ή ένα VPN.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Επιτρέπει το eMule ομάδα + Ultra να ρωτήσω ip μου σε αυτούς τους ιστοχώρους:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21751,46 +22511,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Διεύθυνση Onion</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21800,7 +22537,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21825,95 +22562,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21928,7 +22607,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished">Άγνωστο</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21938,7 +22681,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21950,12 +22708,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21965,7 +22723,7 @@ Also check your ports!</source>
         <translation>Εκκαθαριση</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21980,23 +22738,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22007,7 +22765,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22017,7 +22785,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22027,7 +22800,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22067,7 +22850,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished">Εναρξη</translation>
     </message>
@@ -22082,7 +22865,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Παυση</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">Εισερχόμενα</translation>
     </message>
@@ -22118,32 +22906,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22198,7 +22961,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Σύνολο:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22223,7 +22986,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22235,7 +22998,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Δίκτυο</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22258,7 +23021,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Κατασταση</translation>
     </message>
@@ -22318,28 +23081,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22355,18 +23107,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22401,12 +23153,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22429,22 +23181,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Προστέθηκαν από εσάς</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22479,7 +23231,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22489,12 +23241,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22574,7 +23326,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Ελέγξτε τους ομοτυμους που θα θέλατε να μοιραστείτε το ιδιωτικο σας κλειδι δημοσιευσης</translation>
     </message>
@@ -22584,12 +23336,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Μερίδιο για φίλο</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22608,7 +23360,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Μοιρασμα διαχειριστη</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22628,17 +23380,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished">Ορατότητα</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Προσθέστε έναν κατάλογο μεριδίου</translation>
     </message>
@@ -22648,7 +23400,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Μετακινηση</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Συσχέτιση και κλείσιμο</translation>
     </message>
@@ -22739,7 +23491,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Ο κατάλογος δεν βρέθηκε ή το όνομα καταλόγου δεν γίνετε δεκτο.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22747,7 +23499,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Αρχεια</translation>
     </message>
@@ -22798,16 +23550,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>Ελεγχος αρχειων</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Λυψη επιλεγμενου</translation>
     </message>
@@ -22817,7 +23564,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Λυψη</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Αντιγραφη των retroshare Λινκ στο Clipboard</translation>
     </message>
@@ -22832,7 +23579,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Αποστολη των retroshare Λινκ</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22848,7 +23595,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Recommendation(s)</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Δημιουργία Συλλογής ...</translation>
     </message>
@@ -22873,7 +23620,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Λυψη απο συλλογη αρχειων...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23016,12 +23763,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Ρύθμιση παραμέτρων </translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Δημιουργία διασύνδεσης </translation>
     </message>
@@ -23045,7 +23792,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Εκθυμηση του κωδικου</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Συνδέση</translation>
     </message>
@@ -23384,7 +24131,7 @@ This choice can be reverted in settings.</source>
         <translation>Μήνυμα κατάστασης</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Μήνυμα:</translation>
     </message>
@@ -23629,7 +24376,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Αφαιρέση ολων των ετικετων</translation>
     </message>
@@ -23665,15 +24412,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished">Άγνωστο</translation>
     </message>
@@ -23683,13 +24427,18 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23699,57 +24448,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Μη συνδεδεμένος</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23757,7 +24461,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23767,7 +24471,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23778,12 +24482,11 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23811,7 +24514,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Επιλογές μεταφοράς</translation>
@@ -23822,7 +24525,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Μέγιστη ταυτόχρονη λυψη:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23832,27 +24535,22 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Διαμοιράζονται αυτόματα τα Εισερχόμενα κατάλογο (συνιστάται)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23937,7 +24635,7 @@ p, li { white-space: pre-wrap; }⏎
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23946,12 +24644,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23976,12 +24669,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -24046,7 +24734,12 @@ p, li { white-space: pre-wrap; }
         <translation>Max. σήραγγα Αίτ. διαβιβάζονται ανά δευτερόλεπτο:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24056,17 +24749,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Προειδοποίηση</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24094,7 +24777,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Ολοκληρωση λυψης</translation>
     </message>
@@ -24118,23 +24801,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Έχετε %1 ολοκληρώμενη λυψη</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Η λήψη %1 ολοκληρώθηκε</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 ολοκληρώμενη λυψη</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 ολοκληρώμενη λυψη</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Λήψεις</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Προσθήκες</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Ονομα</translation>
@@ -24341,12 +25040,7 @@ p, li { white-space: pre-wrap; }
         <translation>Καθορίσμος...</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Μετακίνηση στην ουρά...</translation>
     </message>
@@ -24371,7 +25065,7 @@ p, li { white-space: pre-wrap; }
         <translation>Επιλογη κατάλογου</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24392,7 +25086,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24425,17 +25119,7 @@ p, li { white-space: pre-wrap; }
         <translation>Το αρχείο %1 δεν έχει ολοκληρωθεί. Εάν είναι ένα αρχείο πολυμέσων, προσπαθήστε να κάνετε προεπισκόπηση.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Προειδοποίηση</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Αλλαγή όνοματος αρχείου</translation>
     </message>
@@ -24450,7 +25134,7 @@ p, li { white-space: pre-wrap; }
         <translation>Παρακαλούμε εισάγετε ένα νέο--και έγκυρο--όνομα αρχείου</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished">Επεκταση ολων</translation>
@@ -24577,18 +25261,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Στήλες</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Διαδρομή</translation>
     </message>
@@ -24598,7 +25287,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24608,7 +25297,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Δημιουργία Συλλογής ... </translation>
     </message>
@@ -24623,7 +25312,7 @@ p, li { white-space: pre-wrap; }
         <translation>Εμφάνιση Συλλογής ...</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Συλλογή</translation>
     </message>
@@ -24633,7 +25322,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25047,17 +25736,12 @@ p, li { white-space: pre-wrap; }
         <translation>Φορμα</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Κατασταση:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Παράμετροι δικτύου</translation>
     </message>
@@ -25097,27 +25781,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25127,12 +25801,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25269,7 +25943,11 @@ p, li { white-space: pre-wrap; }
         <translation>Σελίδες wiki</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Νέα ομάδα</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Όνομα σελίδας</translation>
     </message>
@@ -25284,7 +25962,7 @@ p, li { white-space: pre-wrap; }
         <translation>Orig Id</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25372,7 +26050,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Σελίδα επεξεργασίας ιστορίκου</translation>
     </message>
@@ -25407,7 +26085,7 @@ p, li { white-space: pre-wrap; }
         <translation>PageId</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25437,18 +26115,14 @@ p, li { white-space: pre-wrap; }
         <translation>Ετικέτες</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Ιστορικό</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Εμφανιση ιστορικόυ</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Κατασταση</translation>
     </message>
@@ -25469,7 +26143,7 @@ p, li { white-space: pre-wrap; }
         <translation>Επαναφορά</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Υποβολη</translation>
     </message>
@@ -25541,6 +26215,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">TimeRange</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25552,7 +26230,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Ανανέωση</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25567,7 +26254,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Άλλοι</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25587,7 +26274,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25617,17 +26304,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Περασμένος μήνας</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Προηγούμενη εβδομάδα</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Σήμερα</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Νεο</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">από</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">μέχρι</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Φίλτρο αναζήτησης </translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Δίκτυο ευρείας</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Διαχείριση λογαριασμών</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Εμφανιση:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>τον εαυτό σας</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Φίλοι</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Μετά</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Προσαρμογη</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Λογαριασμός 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Λογαριασμος 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Λογαριασμός 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">Πλαίσιο ελέγχου</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Θέση παλμό για σύρμα</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25690,42 +26445,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Μετακινηση</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25770,41 +26518,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Μετά</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Άγνωστο</translation>
@@ -25882,7 +26600,7 @@ p, li { white-space: pre-wrap; }
         <translation>% 1y % 2d</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -25915,11 +26633,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Εικόνες (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts
index 74a7b83b3..d11bfb453 100644
--- a/retroshare-gui/src/lang/retroshare_en.ts
+++ b/retroshare-gui/src/lang/retroshare_en.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,23 +566,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -625,7 +612,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,7 +699,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+264"/>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -808,7 +795,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,12 +825,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -851,7 +838,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -871,7 +858,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -909,7 +896,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -929,7 +916,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -959,7 +946,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -969,7 +956,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -977,12 +964,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1002,18 +989,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1028,12 +1015,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1202,17 +1189,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1222,17 +1209,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1217,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1263,7 +1240,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1288,18 +1265,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1314,7 +1291,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1324,7 +1301,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1332,7 +1319,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1523,7 +1510,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1556,14 +1543,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1571,13 +1557,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,7 +1573,29 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,7 +1605,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1654,12 +1662,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1669,42 +1677,23 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-564"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1714,22 +1703,27 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1744,47 +1738,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1799,7 +1793,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
@@ -1819,7 +1813,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1864,7 +1858,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1879,7 +1873,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1899,7 +1893,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1924,7 +1918,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1954,7 +1948,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1964,7 +1958,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +1982,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,22 +2052,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,17 +2067,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2190,7 +2164,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2296,7 +2270,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2332,7 +2306,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2367,12 +2341,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,6 +2426,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2489,7 +2468,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2511,7 +2490,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2561,7 +2540,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2583,7 +2562,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2598,12 +2577,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2619,12 +2598,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2635,12 +2614,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2660,7 +2639,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,7 +2665,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2708,7 +2687,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2734,7 +2713,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2794,7 +2773,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2810,7 +2789,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2862,45 +2841,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2910,7 +2889,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2992,17 +2971,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3022,7 +2996,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3090,7 +3064,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3106,12 +3080,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3121,17 +3095,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,7 +3115,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,22 +3140,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3201,27 +3165,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3267,17 +3236,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3297,12 +3266,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3310,7 +3279,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3350,7 +3319,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3375,7 +3344,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3385,7 +3354,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3424,7 +3393,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3434,7 +3403,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3459,7 +3428,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3472,7 +3441,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3507,7 +3476,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3517,7 +3486,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3582,7 +3556,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3610,7 +3584,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3620,20 +3594,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3643,14 +3614,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3660,8 +3629,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3686,7 +3654,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3978,7 +3946,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3986,8 +3954,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3997,7 +3964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4033,12 +4000,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4058,7 +4025,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4078,18 +4045,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4104,7 +4071,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4144,19 +4111,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4166,24 +4133,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4193,7 +4148,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4246,13 +4201,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,7 +4226,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4306,7 +4261,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4316,7 +4271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4461,17 +4416,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4496,12 +4451,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4516,12 +4466,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +4511,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,16 +4521,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+44"/>
+        <location line="+75"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4589,7 +4536,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+21"/>
+        <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 Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+93"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4604,7 +4560,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4634,17 +4590,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4697,7 +4653,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4707,8 +4663,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4731,7 +4687,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4766,7 +4722,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4776,7 +4732,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4791,7 +4747,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4812,7 +4768,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4820,17 +4776,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,12 +4796,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4821,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4875,7 +4836,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,12 +4846,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4866,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4970,33 +4936,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5086,7 +5052,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5754,7 +5720,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5762,38 +5728,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5801,12 +5767,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5968,7 +5934,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5978,7 +5944,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6038,21 +6004,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6174,7 +6130,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6216,7 +6172,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6252,7 +6208,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6268,7 +6224,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6505,7 +6461,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6543,7 +6499,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6554,132 +6510,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6762,38 +6602,33 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6811,17 +6646,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6831,12 +6656,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6857,38 +6687,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6908,12 +6738,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6923,43 +6753,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7003,13 +6828,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7019,7 +6844,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7054,7 +6879,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7064,7 +6889,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7074,7 +6904,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7300,13 +7135,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7316,57 +7165,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7374,45 +7205,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7437,7 +7272,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7487,12 +7322,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7616,7 +7451,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7624,7 +7459,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7794,7 +7629,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7807,12 +7642,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7837,7 +7672,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7852,14 +7687,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7870,13 +7705,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7889,7 +7724,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8025,7 +7860,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8036,22 +7871,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8071,12 +7906,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8111,22 +7946,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8146,17 +7981,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8169,7 +8004,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8207,18 +8042,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8233,7 +8058,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8248,7 +8073,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8262,11 +8087,6 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8276,7 +8096,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8297,7 +8117,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8359,18 +8179,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8385,17 +8205,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8423,13 +8243,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8499,7 +8319,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8535,7 +8355,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8550,13 +8370,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8571,7 +8391,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8586,7 +8406,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8646,22 +8466,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8736,13 +8546,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8793,17 +8602,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8918,7 +8727,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8931,7 +8740,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8961,7 +8770,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -9000,7 +8809,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9024,21 +8833,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9048,7 +8842,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9077,7 +8871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9108,7 +8902,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9159,7 +8953,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9175,7 +8969,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9194,11 +8988,6 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9228,13 +9017,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9245,7 +9034,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9265,17 +9054,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9288,66 +9077,59 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9357,7 +9139,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9397,23 +9184,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9456,12 +9243,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9491,8 +9278,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9575,12 +9362,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9641,7 +9428,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9661,7 +9448,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9713,7 +9500,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9723,7 +9510,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9738,7 +9525,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9804,12 +9591,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9844,12 +9631,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9860,12 +9647,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9873,7 +9660,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9933,7 +9720,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9956,7 +9743,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,12 +9759,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,23 +9781,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10026,28 +9813,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10057,12 +9838,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10072,7 +9853,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,12 +9928,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10168,22 +9944,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10191,7 +9972,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10251,7 +10032,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10308,12 +10089,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10336,7 +10117,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10349,14 +10130,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10366,7 +10147,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10376,12 +10157,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,14 +10177,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10420,7 +10188,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10468,7 +10236,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10855,7 +10623,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10871,7 +10639,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10890,7 +10658,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10964,7 +10732,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10974,7 +10742,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +10770,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11012,7 +10780,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11022,7 +10790,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11042,37 +10810,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11084,12 +10828,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11104,7 +10848,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11369,14 +11118,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11386,12 +11135,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11401,7 +11150,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11416,27 +11165,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11452,39 +11201,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11504,20 +11243,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11527,78 +11264,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11609,17 +11346,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11634,24 +11371,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11666,12 +11403,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11681,7 +11413,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11756,7 +11488,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11786,7 +11518,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11801,7 +11533,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11849,7 +11581,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11857,7 +11589,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11900,7 +11632,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11980,7 +11712,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11996,12 +11728,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12106,7 +11843,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12156,21 +11893,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12180,7 +11917,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12195,7 +11932,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12210,12 +11947,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12235,12 +11972,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12250,7 +11987,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12258,7 +11995,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12288,13 +12025,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12308,7 +12039,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12318,12 +12049,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12334,27 +12060,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12374,7 +12100,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12384,18 +12110,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12405,7 +12125,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12415,7 +12140,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,15 +12150,10 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12459,7 +12179,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,13 +12189,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12485,7 +12205,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12559,7 +12279,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12569,12 +12289,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12597,34 +12317,18 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12642,32 +12346,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12688,12 +12387,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12702,31 +12396,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12736,7 +12425,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12764,7 +12453,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12780,8 +12469,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12802,7 +12490,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12813,12 +12501,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12843,12 +12531,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12859,35 +12546,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12902,12 +12585,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12937,7 +12615,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12957,7 +12635,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13002,13 +12680,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13023,7 +12700,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13032,17 +12709,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13078,12 +12755,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13098,32 +12775,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13134,32 +12811,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13229,7 +12906,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13269,7 +12946,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13289,18 +12966,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13311,17 +12988,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13341,7 +13008,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13351,21 +13018,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13380,7 +13047,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13390,30 +13057,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13528,13 +13195,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13554,7 +13221,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13575,7 +13242,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13605,18 +13272,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13656,13 +13323,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13672,12 +13339,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13755,7 +13422,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13765,7 +13432,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13788,7 +13455,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13796,7 +13463,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13824,7 +13491,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13834,37 +13501,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13904,7 +13571,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13956,7 +13623,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13966,12 +13633,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13981,22 +13648,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14005,24 +13667,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14037,12 +13689,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14142,7 +13794,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14152,16 +13804,16 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14191,17 +13843,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14232,7 +13884,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14242,7 +13894,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14252,7 +13904,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14261,16 +13913,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14297,12 +13939,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14378,7 +14020,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14392,7 +14034,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14407,28 +14049,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14463,17 +14095,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14527,7 +14149,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14537,7 +14159,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14572,7 +14194,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14713,7 +14335,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14723,7 +14345,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14737,13 +14359,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14776,13 +14392,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14792,12 +14413,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14830,7 +14451,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14851,7 +14472,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14881,19 +14502,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14903,12 +14524,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14918,7 +14539,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15033,7 +14654,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15043,7 +14664,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15150,7 +14771,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15165,7 +14786,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15175,12 +14796,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15418,7 +15039,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15438,12 +15059,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15458,7 +15079,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15469,19 +15090,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15489,7 +15108,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15628,12 +15247,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15678,7 +15292,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15724,21 +15343,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15756,7 +15375,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15832,12 +15451,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15863,7 +15482,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15884,7 +15503,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15924,7 +15543,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15982,7 +15601,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16300,17 +15919,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16339,7 +15958,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16398,19 +16017,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16446,12 +16065,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16662,27 +16281,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16735,7 +16339,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16755,8 +16359,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16781,13 +16385,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16815,12 +16419,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16835,22 +16439,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16866,17 +16460,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16886,7 +16470,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16906,22 +16490,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16936,7 +16510,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16947,7 +16521,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16957,7 +16531,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16965,12 +16539,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17004,7 +16578,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17042,17 +16616,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17068,7 +16632,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17083,17 +16647,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17106,18 +16665,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17128,12 +16687,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17143,7 +16702,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17153,17 +16712,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17173,7 +16732,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17183,7 +16742,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17224,7 +16783,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17247,17 +16806,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17267,15 +16816,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17285,42 +16834,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17340,7 +16889,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17370,17 +16919,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17395,17 +16944,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17415,31 +16959,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17454,7 +16994,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17528,16 +17068,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17627,16 +17157,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17744,7 +17274,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17760,7 +17290,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17795,12 +17325,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17844,27 +17374,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17874,12 +17404,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17909,13 +17439,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17927,22 +17457,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17957,7 +17477,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17972,25 +17492,20 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PulseMessage</name>
@@ -18000,7 +17515,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18019,7 +17534,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18029,7 +17544,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18056,7 +17571,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18066,7 +17581,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18086,7 +17601,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18202,7 +17717,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18210,42 +17725,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18277,7 +17787,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18285,8 +17795,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18554,12 +18064,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18590,7 +18100,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18624,7 +18134,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18643,26 +18153,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18742,7 +18232,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18752,7 +18242,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18762,7 +18252,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18778,7 +18268,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18845,7 +18335,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18873,7 +18363,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19053,29 +18543,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19318,18 +18792,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19469,7 +18931,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19636,7 +19098,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19649,7 +19111,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19822,22 +19284,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+4"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+19"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19845,12 +19302,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20538,7 +19995,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20659,7 +20116,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20679,7 +20136,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20735,7 +20192,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20749,6 +20206,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20762,11 +20224,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20789,17 +20246,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20823,9 +20275,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20846,7 +20296,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20907,7 +20357,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20928,7 +20378,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20958,7 +20408,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20976,7 +20426,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20993,12 +20443,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21059,7 +20509,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21074,7 +20524,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21174,23 +20624,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,7 +20650,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21237,7 +20687,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -21248,17 +20698,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21278,7 +20728,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21286,7 +20736,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21302,22 +20752,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21334,7 +20784,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21359,8 +20809,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21368,7 +20818,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21399,7 +20849,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21444,12 +20894,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21469,12 +20919,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21484,17 +20939,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21504,7 +20949,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21514,12 +20959,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21578,12 +21023,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21604,22 +21049,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21632,16 +21077,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21651,46 +21101,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21700,7 +21127,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21725,95 +21152,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21828,7 +21197,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21838,7 +21271,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21850,12 +21298,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21865,7 +21313,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21880,23 +21328,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21907,7 +21355,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21917,7 +21375,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21927,7 +21390,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21967,7 +21440,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21982,7 +21455,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22018,32 +21496,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22098,7 +21551,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22123,7 +21576,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22135,7 +21588,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22158,7 +21611,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22218,28 +21671,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22255,18 +21697,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22301,12 +21743,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22329,22 +21771,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22379,7 +21821,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22389,12 +21831,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22474,7 +21916,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22484,12 +21926,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22508,7 +21950,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22528,17 +21970,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22548,7 +21990,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22639,7 +22081,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22647,7 +22089,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22698,16 +22140,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22717,7 +22154,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22732,7 +22169,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22748,7 +22185,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22773,7 +22210,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22916,12 +22353,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22945,7 +22382,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23284,7 +22721,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23521,7 +22958,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23557,15 +22994,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23575,13 +23009,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23591,57 +23030,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23649,7 +23043,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23659,7 +23053,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23670,12 +23064,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23703,7 +23096,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23714,7 +23107,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23724,27 +23117,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23829,7 +23217,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23838,12 +23226,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23868,12 +23251,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23938,7 +23316,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23948,17 +23331,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23986,7 +23359,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24014,19 +23387,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -24233,12 +23606,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24263,7 +23631,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24284,7 +23652,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24317,17 +23685,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24342,7 +23700,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24469,18 +23827,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24490,7 +23853,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24500,7 +23863,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24515,7 +23878,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24525,7 +23888,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24939,17 +24302,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24989,27 +24347,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25019,12 +24367,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25161,7 +24509,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25176,7 +24524,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25264,7 +24612,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25299,7 +24647,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25329,18 +24677,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25361,7 +24705,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25444,7 +24788,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25459,7 +24808,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25479,7 +24828,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25509,7 +24858,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25519,7 +24868,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25582,42 +24931,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25662,41 +25004,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25774,7 +25086,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25811,7 +25123,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_es.qm b/retroshare-gui/src/lang/retroshare_es.qm
index 782b9d443..c0d639a4c 100644
Binary files a/retroshare-gui/src/lang/retroshare_es.qm and b/retroshare-gui/src/lang/retroshare_es.qm differ
diff --git a/retroshare-gui/src/lang/retroshare_es.ts b/retroshare-gui/src/lang/retroshare_es.ts
index cc21a60c3..3df49a47e 100644
--- a/retroshare-gui/src/lang/retroshare_es.ts
+++ b/retroshare-gui/src/lang/retroshare_es.ts
@@ -84,6 +84,13 @@
         <translation>Sólo nodo oculto</translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Añadir un comentario</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: Búsqueda avanzada</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Criterios de búsqueda</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Añadir un criterio de búsqueda adicional.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Reinicializa el criterio de búsqueda.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Cancela la búsqueda.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Buscar</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Crear álbum</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Nombre del álbum:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Categoría:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Animales</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Familia</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Amigos</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Flores</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Festivo</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Paisajes</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Mascotas</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Retratos</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Viajes</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Trabajo</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Aleatorio</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Título:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Dónde:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotógrafo:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descripción:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Opciones de compartición</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Política:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Calidad:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Comentarios:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Identidad:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Público</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Restringido</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Redimensionar imágenes (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Redimensionar imágenes (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Enviar imágenes originales</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">No se permiten comentarios</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Comentarios autenticados</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Permitir cualquier comentario</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Publicar con identidad</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Arrastrar y soltar para insertar imágenes. A continuación pulse en una imagen para editar los detalles.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Atrás</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Añadir fotos</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Publicar álbum</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Álbum sin título</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Diga algo sobre este álbum...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">¿Dónde estaban tomadas?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Cargar miniatura del álbum</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Miniatura del álbum</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Texto de la etiqueta</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Resumen</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>Título</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Dónde:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Cuándo</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descripción:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Opciones de compartición</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Comentarios</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Publicar identidad</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Visibilidad</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -269,7 +483,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+10"/>
         <source>Where:</source>
-        <translation type="unfinished">Donde:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Advertencia: Los servicios aquí son experimentales. Por favor, ayúdenos a probarlos.
@@ -569,6 +783,14 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <source>Circles</source>
         <translation>Círculos</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">GxsForos</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">GxsCanales</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation>Fotos</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">Guardar imagen</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -633,13 +842,17 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Añadir avatar</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Establecer imagen de avatar</translation>
     </message>
@@ -658,6 +871,10 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Cargar avatar</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation>Reinicializar</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Tasa de recepción</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Tasa de envío</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Siempre encima</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Estilo</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <source>% Opaque</source>
         <translation>% Transparencia</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Guardar</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Cancelar</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Desde:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Ocultar ajustes</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,7 +1063,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Comentario</translation>
     </message>
@@ -852,12 +1093,12 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;El autor de este mensaje (con Identificación %1) está excluído.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positivo</translation>
     </message>
@@ -885,7 +1126,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positivo</translation>
     </message>
@@ -943,7 +1184,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">Compartir</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Cambiar el estado de lectura del mensaje</translation>
     </message>
@@ -983,7 +1224,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -991,12 +1232,12 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Esto me gusta</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1042,12 +1283,12 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,17 +1457,17 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Canales</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>General</translation>
     </message>
@@ -1236,17 +1477,11 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Descargas</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Cargar mensajes en segundo plano (hilo)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Abrir cada canal en una nueva pestaña</translation>
     </message>
@@ -1254,7 +1489,7 @@ Pero recuerde: Todos los datos aquí *SE PERDERÁN* cuando se actualicen los pro
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1512,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Esto me gusta</translation>
     </message>
@@ -1302,18 +1537,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1328,7 +1563,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
@@ -1338,7 +1573,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Comentario</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished">Comentarios</translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Ocultar</translation>
     </message>
@@ -1346,7 +1591,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
@@ -1537,7 +1782,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Mostrar sala de chat</translation>
     </message>
@@ -1549,6 +1794,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>Chats</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Tiene %1 nuevos mensajes</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Tiene %1 nuevo mensaje</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 nuevos mensajes</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 nuevo mensaje</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1570,14 +1831,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Sala desconocida</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Borrar todo</translation>
     </message>
@@ -1585,13 +1845,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Recuento</translation>
     </message>
@@ -1601,7 +1861,33 @@ into the image, so as to
         <translation>Tema</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>Salas de chat privadas suscritas</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>Salas de chat públicas suscritas</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Salas de chat privadas</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Salas de chat públicas</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Salas de chat&lt;/h1&gt;                              	                      &lt;p&gt;Las salas de chat funcionan de forma bastante parecida al IRC.                                      	                      Le permiten hablar de forma anónima con montones de personas sin necesidad de hacer amigos.&lt;/p&gt;                    	                      &lt;p&gt;Una sala de chat puede ser pública (sus amigos la ven) o privada (sus amigos no pueden verla, a menos que les                                     invite con &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Una vez haya sido invitado a una sala privada, podrá verla cuando la estén usando   	                      sus amigos.&lt;/p&gt;                                                                                               	                      &lt;p&gt;La lista de la izquierda muestra                                                                                     	                      salas de chat en las que están participando sus amigos. Puede                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Hacer clic para crear una nueva sala de chat&lt;/li&gt;                                                              		     &lt;li&gt;Hacer doble clic en una sala de chat para entrar, chatear, y mostrarla a sus amigos.&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Aviso: Para que las salas de chat funcionen adecuadamente, su computadora tiene que estar en hora. ¡Compruebe el reloj de su sistema!	                      &lt;/p&gt;                                      	                      </translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Crear sala de chat</translation>
     </message>
@@ -1611,7 +1897,7 @@ into the image, so as to
         <translation>Abandonar esta sala</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Crear una identidad no anónima y entrar en esta sala</translation>
     </message>
@@ -1670,12 +1956,12 @@ Seleccione salas de chat a la izquierda para mostrar detalles.
 Haga doble clic en una sala de chat para entrar y conversar.</translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 le invita a una sala de chat llamada %2</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Escoja una identidad no anónima para esta sala de chat:</translation>
     </message>
@@ -1685,31 +1971,31 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Escoja una identidad para esta sala de chat:</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Crear sala de chat</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[No se ha proporcionado tema]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Información sobre la sala</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Privada</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Pública</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>Identificaciones anónimas aceptadas</translation>
     </message>
@@ -1719,25 +2005,42 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Suprimir autosuscripción</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Añadir  autosuscripción</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Buscar salas de chat</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Buscar por nombre</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Suscrito</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation> Columnas</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">No</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1749,47 +2052,47 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Nombre de la sala de chat:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>Identificador de la sala de chat:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Tema: </translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Seguridad:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Vecinos:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Etiqueta de texto</translation>
     </message>
@@ -1804,24 +2107,13 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Sin identificaciones anónimas</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>columna</translation>
@@ -1835,7 +2127,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Eliminar elemento</translation>
     </message>
@@ -1880,22 +2172,46 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>General</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Chat distante</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Todos</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Contactos</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Nadie</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Aceptar chat distante cifrado de</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Ajustes del chat</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Habilitar emoticonos en conversación privada</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Habilitar emoticonos en conversación en grupo</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Habilitar fuentes personalizadas</translation>
     </message>
@@ -1904,6 +2220,10 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Enable custom font size</source>
         <translation>Habilitar tamaño de fuente personalizado</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Tamaño mínimo de fuente</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1915,7 +2235,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Habilitar cursiva</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1940,7 +2260,11 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Cargar imágenes incrustadas</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Sala de chat</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Icono de pestaña intermitente</translation>
     </message>
@@ -1949,6 +2273,10 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Do not send typing notifications</source>
         <translation>No enviar notificaciones de actividad de escritura</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Chat privado</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1970,7 +2298,11 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Icono de ventana/pestaña intermitente</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Fuente del chat</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Cambiar fuente del chat</translation>
     </message>
@@ -1980,10 +2312,14 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Fuente del chat:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Historial</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Estilo</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1998,13 +2334,17 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Variant:</source>
         <translation>Variante:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Chat en grupo</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Chat privado</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation>Escoja su fuente predeterminada para Chat.</translation>
     </message>
@@ -2068,28 +2408,22 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;En esta pestaña puedes configurar cuantos mensajes guardará en disco RetroShare y cuantas conversaciones previas mostrará para los distintos sistemas de chateo. El periodo máximo de almacenado permite eliminar mensajes viejos y evita que el historial de chateo se llene de conversaciones intrascendentes (salas de chateo y chateo distante)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Salasdechat</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Habilitar:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">Buscar</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2099,17 +2433,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Salas de chat</translation>
@@ -2206,7 +2530,11 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Máximo periodo de almacenamiento, en días (0=mantener todo):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Búsqueda por defecto</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Discriminar minúsculas/mayúsculas</translation>
     </message>
@@ -2245,6 +2573,10 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Threshold for automatic search</source>
         <translation>Umbral para búsqueda automática</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Identidad por defecto para las salas de conversación:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2312,7 +2644,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Mostrar chat</translation>
     </message>
@@ -2348,7 +2680,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
@@ -2383,12 +2715,12 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>Insertar emoticono</translation>
     </message>
@@ -2397,6 +2729,10 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Attach a Picture</source>
         <translation>Adjuntar una imagen</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2468,6 +2804,11 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <source>Insert horizontal rule</source>
         <translation>Insertar regla horizontal</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Guardar imagen</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2505,7 +2846,7 @@ Haga doble clic en una sala de chat para entrar y conversar.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>está escribiendo...</translation>
     </message>
@@ -2529,7 +2870,7 @@ after HTML conversion.</source>
         <translation>Escoja su fuente.</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>¿Seguro que quiere borrar el historial?</translation>
     </message>
@@ -2579,7 +2920,7 @@ after HTML conversion.</source>
         <translation>está ocupado e igual no contesta</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Buscar discriminando mayúsculas/minúsculas</translation>
     </message>
@@ -2601,7 +2942,7 @@ after HTML conversion.</source>
         <translation>No detenerse a colorear después de que X elementos se encontrasen (necesita más CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Buscar anterior&lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Mayús+G&lt;/i&gt;</translation>
     </message>
@@ -2616,12 +2957,16 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Buscar &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Estado)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Configurar fuente de texto y color</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Adjuntar un archivo</translation>
     </message>
@@ -2637,12 +2982,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Marcar este texto seleccionado&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation>Identificación persona:</translation>
     </message>
@@ -2654,12 +2999,12 @@ Double click on it to add his name on text writer.</source>
 Haga doble clic sobre este para añadir su nombre en el compositor de texto.</translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation>No firmado</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>elementos encontrados.</translation>
     </message>
@@ -2679,7 +3024,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Escriba un mensaje aquí</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>No parar de colorear tras</translation>
     </message>
@@ -2705,7 +3050,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Mostrando detalles:</translation>
     </message>
@@ -2727,7 +3072,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Círculos personales</translation>
     </message>
@@ -2753,7 +3098,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Amigos</translation>
     </message>
@@ -2813,7 +3158,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Amigos de sus amigos</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Círculos externos (Admin)</translation>
     </message>
@@ -2829,7 +3174,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Círculos</translation>
     </message>
@@ -2881,48 +3226,43 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: No se pueden obtener los detalles del vecino.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2934,7 +3274,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Cifrado</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>No conectado</translation>
     </message>
@@ -3016,17 +3356,25 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>ninguno</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Este certificado contiene:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;una &lt;b&gt;identificación de nodo&lt;/b&gt; y &lt;b&gt;nombre&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">una &lt;b&gt;dirección .onion&lt;/b&gt; y &lt;b&gt;puerto&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">una &lt;b&gt;dirección IP&lt;/b&gt; y &lt;b&gt;puerto&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Puede usar este certificado para hacer nuevos amigos. Envíelo por correo electrónico, o proporciónelo en mano.&lt;/p&gt;</translation>
     </message>
@@ -3041,7 +3389,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este es el método de cifrado usado por &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. La conexión a nodos amigos&lt;/p&gt;&lt;p&gt;siempre se cifra fuertemente, y si está presente el DHE (intercambio de claves Diffie-Hellman)&lt;/p&gt;&lt;p&gt;la conexión además usa &amp;quot;secreto perfecto hacia delante&amp;quot; (perfect forward secrecy).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>con</translation>
     </message>
@@ -3058,16 +3406,118 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <source>Connect Friend Wizard</source>
         <translation>Asistente para conectarse con los amigos</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Añadir un amigo nuevo</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Obtener un archivo de certificado de su amigo</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">Hacer a&amp;migos con los amigos de mis amigos seleccionados</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Email 
+ (Your friend will receive an email with instructions how to download RetroShare)</source>
+        <translation type="vanished">&amp;Enviar una invitación por correo
+ (Su amigo recibirá un correo electrónico con instrucciones sobre cómo descargar RetroShare)</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Incluir firmas</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Copiar su certificado al portapapeles</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Guardar su certificado en un archivo</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Abrir programa de email</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Abrir certificado de su amigo desde fichero</translation>
     </message>
+    <message>
+        <source>Open certificate</source>
+        <translation type="vanished">Abrir certificado</translation>
+    </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">Por favor, pegue el certificado Retroshare de su amigo en el recuadro de debajo</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Archivos de certificados PGP</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Usar certificados PGP guardados en archivos.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Importar certificado PGP de un amigo...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Tiene que crear un archivo con su certificado PGP y enviárselo a un amigo. También puede usar un archivo generado anteriormente.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Exportar mi certificado PGP...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Arrastre y suelte el certificado de sus amigos en esta ventana o especifique la ruta aquí</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Navegar</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Amigos de amigos</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Elija ahora quienes quiere hacer sus amigos.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Mostrarme:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Hacer amistad con estos vecinos</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>ID de RetroShare</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Utilize la ID de RetroShare para añadir a amigos que estén disponibles en su red.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Añadir la ID de RetroShare del amigo...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Pegar el ID de amigos de RetroShare en el siguiente cuadro</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Introduzca el ID de RetroShare de su amigo, p,ej. Peer@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3109,7 +3559,27 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Correo electrónico</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Invitar a amigos por correo electrónico</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Introduzca las direcciones de email de sus amigos (separadas cada una con un punto y coma)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Direcciones de correo de sus amigos:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Introduzca la dirección de correo de su amigo</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Asunto:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3125,32 +3595,78 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Detalles de la solicitud</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Detalles del vecino</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Email:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Nodo:</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">Por favor, observe que RetroShare requerirá cantidades excesivas de ancho de banda, memoria y CPU si añade demasiados amigos. Puede añadir tantos amigos como quiera, pero más de 40 probablemente requerirá demasiados
+recursos.</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">Este asistente le ayudará a conectar a su(s) amigo(s) a la red RetroShare.&lt;br&gt;Seleccione cómo desea añadir un amigo:</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Introduzca el certificado manualmente</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">Introduzca la identificación de RetroShare manualmente</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">&amp;Enviar una invitación mediante proveedores de correo web</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Intercambie muchas recomendaciones de amigos con sus amigos</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">Certificado de RetroShare</translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">Por favor, pegue debajo el certificado de RetroShare de su amigo</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Pegar certificado</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este recuadro espera el certificado de RetroShare de su amigo. ADVERTENCIA: Este es distinto de la clave del perfil de su amigo. No pegue aquí la clave del perfil de su amigo (ni siquiera una parte de ella). No va a funcionar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Añadir amigo a grupo:</translation>
     </message>
@@ -3160,7 +3676,7 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Autenticar amigo (firmar la clave PGP)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3185,22 +3701,16 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Añadir como amigo al conectarse con</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Para aceptar la solicitud de amigo, pulse en el botón Finalizar.</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Lo siento, ha ocurrido un error</translation>
     </message>
@@ -3220,27 +3730,32 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
         <translation>Detalles acerca de su amigo:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Validez de la clave:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Firmantes</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmar la clave de un amigo es una forma de expresar su confianza en este amigo a sus otros amigos. Las firmas de debajo atestiguan criptográficamente que los titulares de las claves listadas reconocen como auténtica la clave PGP actual.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Este vecino ya está en su lista de amigos. Añadiendolo sólo podrá establecer su dirección ip.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3286,17 +3801,49 @@ Haga doble clic sobre este para añadir su nombre en el compositor de texto.</tr
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Error al cargar el certificado</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">No se pudieron obtener los detalles del vecino con clave PGP %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Vecinos a quienes no he firmado las claves PGP</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Amigos de amigos que me han firmado la clave PGP</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Vecinos bloqueados a quienes he firmado la llave PGP</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Nombre del vecino</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Tambien firmado por</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">ID del vecino</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">El certificado parece ser válido</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>¡No es un certificado RetroShare válido!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Invitación de RetroShare</translation>
     </message>
@@ -3318,12 +3865,12 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>¿Este es su propio certificado? No querría hacerse amigo de si mismo. ¿No es así?</translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3331,7 +3878,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation>Esta clave ya está en su lista de confianza</translation>
     </message>
@@ -3371,7 +3918,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>Tiene una solicitud de amistad de</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3396,7 +3943,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3406,7 +3953,47 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">La carga del certificado PGP ha fallado: archivo %1 no encontrado</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Este vecino %1 no está disponible en su red</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Usar el nuevo formato de certificado (más seguro y robusto)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Usar el viejo formato de certificado (compatible con versiones anteriores)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Quitar las firmas</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">Invitar a RetroShare</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Ayuda para conectar con sus amigos</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Puede copiar este texto y enviarlo a su amigo por email o de alguna otra forma</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Su certificado se ha copiado al portapapeles. Péguelo y envíeselo a un amigo por email u otro medio</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Guardar como...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3445,7 +4032,11 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>*** Ningúno ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Utilizar como fuente directa, cuando esté disponible</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>Dir-IP:</translation>
     </message>
@@ -3455,7 +4046,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>Dirección-IP</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Mostrar opciones avanzadas</translation>
     </message>
@@ -3464,6 +4055,10 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmar una clave de un amigo es una forma de expresar su confianza en este amigo al resto de sus amigos. Les ayuda a decidir si permitir conexiones desde esa clave en base a la propia confianza de usted. Firmar una clave es absolutamente opcional y no se puede deshacer, así que hágalo juiciosamente. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare comprueba periódicamente sus listas de amigos en busca de ficheros explorables que coincidan con sus transferencias, para establecer una transferencia directa. En tal caso, su amigo sabe que usted está descargando el fichero.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Para evitar este comportamiento sólo para este amigo, desmarque esta casilla. Aún puede efectuar una transferencia directa si la pide explícitamente, por ejemplo, descargando de la lista de ficheros de su amigo. Está ajuste se aplica a todas las ubicaciones del mismo nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3474,13 +4069,45 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Los vecinos que tengan esta opción no pueden conectar si la dirección de su conexión no está en la lista blanca. Esto le protege de ataques de reenvío de tráfico. Cuando lo use, se informará de los vecinos rechazados mediante &amp;quot;elementos de seguridad de la suscripción (feed)&amp;quot; en la sección de Suscripción de Noticias. Desde allí, puede incluir sus IPs en lista blanca/negra. Se aplica a todas las ubicaciones del mismo nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Recomendar varios amigos a los demás</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Recomendaciones de amigo</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">El texto de debajo es su certificado Retroshare. Tiene que proporcionárselo a su amigo.</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Mensage:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Recomendar amigos</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">A</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Por favor, seleccione al menos un amigo por recomendación.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Por favor, seleccione al menos un amigo como destinatario.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Añadir al grupo de claves (&apos;keyring&apos;)</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Esta clave ya está en su grupo de claves (&apos;keyring&apos;)</translation>
     </message>
@@ -3496,7 +4123,7 @@ mensajes distantes a este vecino
 incluso si no hace amigos.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>El certificado tiene un número de versión incorrecto. Recuerde que las redes de v0.6 y v0.5 son incompatibles.</translation>
     </message>
@@ -3531,7 +4158,7 @@ incluso si no hace amigos.</translation>
         <translation>Añadir IP a la lista blanca</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>¡No hay IP en este certificado!</translation>
     </message>
@@ -3541,10 +4168,27 @@ incluso si no hace amigos.</translation>
         <translation>&lt;p&gt;Este certificado no tiene IP. Dependerá del descubrimiento y la DHT (tabla distribuida de hashes) para encontrarlo. A causa de que usted requiere que se limpie la lista blanca, el vecino generará una advertencia de seguridad en la pestaña de Novedades (feed). Desde allí puede añadir su IP a la lista blanca.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Añadido con el certificado de %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Pegar certificado de su amigo desde el Portapapeles</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">La carga del certificado falló: No se pudo leer del archivo %1</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">La carga del certificado falló: Hay algo mal con %1</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3606,7 +4250,7 @@ incluso si no hace amigos.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>Configurar UDP</translation>
     </message>
@@ -3642,7 +4286,7 @@ 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;Lucida Grande&apos;; font-size:13pt;&quot;&gt;puede cerrarlo.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Asistente de conexión</translation>
     </message>
@@ -3652,20 +4296,17 @@ p, li { white-space: pre-wrap; }
         <translation>ID del vecino inválido</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Estado desconocido</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Desconectado</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Detrás de NAT simétrico</translation>
     </message>
@@ -3675,14 +4316,12 @@ p, li { white-space: pre-wrap; }
         <translation>Detrás de NAT y sin DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Reiniciar red</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>Detrás de NAT</translation>
     </message>
@@ -3692,8 +4331,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sin DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>ESTADO DE LA RED BUENO!</translation>
     </message>
@@ -3718,7 +4356,7 @@ p, li { white-space: pre-wrap; }
         <translation>Encontrando vecinos de RS</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>La búsqueda requiere DHT</translation>
     </message>
@@ -4010,7 +4648,7 @@ p, li { white-space: pre-wrap; }
         <translation>Por favor, intenta volver a importar el certificado completo</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4018,8 +4656,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>REENVÍO NO VERIFICABLE!</translation>
     </message>
@@ -4029,7 +4666,7 @@ p, li { white-space: pre-wrap; }
         <translation>REENVÍO NO VERIFICABLE Y SIN DHT</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Buscando</translation>
     </message>
@@ -4065,12 +4702,12 @@ p, li { white-space: pre-wrap; }
         <translation>Detalles del círculo</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nombre, contacto del autor y lista de miembros invitados del círculo será visible para todos los miembros invitados. Si el círculo no es privado, también será visible a los nodos vecinos de los nodos que alojen a los miembros invitados.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4090,7 +4727,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>IDs</translation>
     </message>
@@ -4110,18 +4747,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtrar</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Miembros invitados</translation>
     </message>
@@ -4136,7 +4773,15 @@ p, li { white-space: pre-wrap; }
         <translation>Personas conocidas</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Tipo</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
@@ -4176,19 +4821,23 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Los círculos se pueden restringir a los miembros de otro círculo. Sólo los miembros de ese segundo círculo tendrán permitido ver el nuevo círculo y su contenido (lista de miembros, etc.).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Sólo visible para los miembros de:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Por favor elija un nombre para su círculo</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Círculo seleccionado sin restricciones</translation>
     </message>
@@ -4198,24 +4847,12 @@ p, li { white-space: pre-wrap; }
         <translation>No hay limitaciones en el círculo seleccionado</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
@@ -4225,7 +4862,7 @@ p, li { white-space: pre-wrap; }
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Buscar</translation>
@@ -4240,6 +4877,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Firmado</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Firmado por nodos conocidos</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4256,6 +4897,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>Identidad PGP</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Identidad anónima</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4278,13 +4923,17 @@ p, li { white-space: pre-wrap; }
         <translation>Crear nuevo círculo</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">Identidad vinculada a PGP</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Añadir miembro</translation>
     </message>
@@ -4303,7 +4952,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crear un grupo</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Nombre del grupo:</translation>
     </message>
@@ -4338,7 +4987,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Nuevo mensaje del canal</translation>
     </message>
@@ -4348,7 +4997,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mensaje del canal</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4409,11 +5058,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Utilice arrastrar y soltar / Botón añadir archivos, para nuevos hash de archivos&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copiar/pegar enlaces de RetroShare desde sus recursos compartidos&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Adjuntar archivo</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Añadir imagen al canal</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Mensaje</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Asunto:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4499,17 +5160,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4528,18 +5189,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Archivo ya añadido y hash generado</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Por favor, añada un asunto</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Cargar imagen en miniatura</translation>
     </message>
@@ -4554,12 +5214,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Generar datos masivos</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>¿De veras quiere generar %1 mensajes?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Está a punto de añadir archivos que actualmente no está compartiendo. ¿Seguro que quiere continuar?</translation>
     </message>
@@ -4593,7 +5259,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Enviar mensaje al foro</translation>
     </message>
@@ -4602,6 +5268,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Foro</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Asunto</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4622,8 +5292,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4642,7 +5312,7 @@ p, li { white-space: pre-wrap; }
         <translation>En esta ventana puede adjuntar archivos mediante arrastrar y soltar</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4672,17 +5342,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Ningún foro</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>En respuesta a</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Título</translation>
     </message>
@@ -4736,7 +5406,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Cargar archivo de imagen</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>Identificación no compatible para este foro</translation>
     </message>
@@ -4746,8 +5416,8 @@ Do you want to discard this message?</source>
         <translation>Ninguna de sus identidades tiene permitido publicar en este foro. Esto se podría deber a que el foro se esté limitando a un círculo que no contiene ninguna de sus identidades, o a que los indicativos del foro requieran una identidad firmada-con-PGP.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Generar datos masivos</translation>
     </message>
@@ -4756,6 +5426,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>¿De veras quiere generar %1 mensajes?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Enviar</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4770,7 +5444,23 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Crear sala de chat</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Un &quot;Chat lobby&quot; es una sala de chat en grupo descentralizada y anónima. Todos los participantes reciben todos los mensajes. Una vez que se crea la sala puede invitar a otros amigos de la ficha de Amigos.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Nombre de la sala:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Tema de la sala:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4805,7 +5495,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
@@ -4815,7 +5505,11 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si marca esto, sólo se pueden usar las identificaciones firmadas-con-PGP para unirse y hablar en esta sala. Esta limitación previene el spam anónimo ya que se hace posible para, al menos algunas personas en la sala, localizar el nodo spammer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>requiere identidades firmadas-con-PGP</translation>
     </message>
@@ -4830,7 +5524,11 @@ Do you want to discard this message?</source>
         <translation>Seleccione los amigos para el chat de grupo.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Amigos invitados</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Crear sala de chat</translation>
@@ -4851,7 +5549,7 @@ Do you want to discard this message?</source>
         <translation>Contactos:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Identidad a usar:</translation>
     </message>
@@ -4859,17 +5557,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Información pública</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
@@ -4879,12 +5577,12 @@ Do you want to discard this message?</source>
         <translation>ID del lugar:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Versión del programa:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>En línea desde:</translation>
     </message>
@@ -4904,7 +5602,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4914,7 +5617,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Otra información</translation>
     </message>
@@ -4924,12 +5627,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished">Perfil</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Certificado</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4939,7 +5647,11 @@ Do you want to discard this message?</source>
         <translation>Incluir firmas</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Guardar mi clave en un archivo</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exportar identidad</translation>
     </message>
@@ -5013,33 +5725,33 @@ y utilizar el botón Importar para cargarla</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Texto de la etiqueta</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>Huella de validación de clave PGP:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Información del nodo</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>Identificación de PGP :</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Nodos amigos:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5078,6 +5790,14 @@ y utilizar el botón Importar para cargarla</translation>
         <source>Node</source>
         <translation>Nodo</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Crear nuevo nodo...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">mostrar ventana de estadísticas</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5094,6 +5814,10 @@ y utilizar el botón Importar para cargarla</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Retroshare usar la DHT (tabla de hashes dinámica) de Bittorrent como un proxy (interpuesto) para conexiones. No &quot;almacena&quot; su IP en la DHT. 				                        En su lugar, la DHT es usada por sus amigos para llegar a usted mientras se procesan peticiones DHT estándar. 												El indicador de estado se volverá verde tan pronto como Retroshare obtenga una respuesta DHT de uno de sus amigos.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5129,7 +5853,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5797,7 +6521,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Abrir archivo</translation>
     </message>
@@ -5805,38 +6529,38 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>a</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>Ignorar Mayús/Minús</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>dd.MM.yyyy</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5844,12 +6568,12 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Widget de expresiones</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Borrar esta expresión</translation>
     </message>
@@ -6011,7 +6735,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Imagen</translation>
     </message>
@@ -6021,7 +6745,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6081,21 +6805,11 @@ y utilizar el botón Importar para cargarla</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Carpetas de amigos</translation>
     </message>
@@ -6217,7 +6931,7 @@ y utilizar el botón Importar para cargarla</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation>Identidad</translation>
     </message>
@@ -6252,6 +6966,10 @@ y utilizar el botón Importar para cargarla</translation>
         <source>Show State</source>
         <translation>Mostrar estado</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">Nodos de confianza</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6259,7 +6977,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Mostrar grupos</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
@@ -6295,7 +7013,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Añadir a grupo</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Buscar</translation>
@@ -6311,7 +7029,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Ordenar por estado</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Detalles del perfil</translation>
     </message>
@@ -6555,7 +7273,7 @@ al menos un vecino no fue añadido al grupo</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Confirmar solicitud de amistad</translation>
     </message>
@@ -6572,6 +7290,10 @@ al menos un vecino no fue añadido al grupo</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Buscar:</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6593,7 +7315,7 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Buscar a amigos</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Marcar todo</translation>
     </message>
@@ -6604,134 +7326,16 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>No marcar nada</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished">Dirección</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Estado</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Hacer amigo</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished">El proxy no está habilitado o está estropeado.
-¿¿Están todos los servicios en marcha y ejecutándose correctamente??
-¡Compruebe también sus puertos!</translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Editar mensaje de estado</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Difusión</translation>
     </message>
@@ -6814,38 +7418,33 @@ Also check your ports!</source>
         <translation>Restablecer la fuente por defecto</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Juego de claves</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Red&lt;/h1&gt;                                       &lt;p&gt;La pestaña de Red muestra sus nodos RetroShare amigos: los nodos RetroShare vecinos que están conectados a usted.     &lt;/p&gt;                                                       &lt;p&gt;Puede agrupar nodos juntos para permitir un nivel de regulación más fino del acceso a la información, por ejemplo para permitir que sólo          algunos nodos vean algunos de sus archivos.&lt;/p&gt;     &lt;p&gt;A la derecha, encontrará 3 pestañas útiles:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Difusión envía mensajes a todos los nodos conectados a la vez&lt;/li&gt;                                   &lt;li&gt;Gráfica de red local muestra la red alrededor de usted, basándose en la información de descubrimiento&lt;/li&gt;                       &lt;li&gt;El juego de claves contiene claves de nodos que ha recopilado, en su mayoría redirigidos hacia usted por sus nodos amigos&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Chat de difusión de RetroShare: Los mensajes se envían a todos los amigos conectados.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Gráfica de la red</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Configure su mensaje de estado aquí.</translation>
     </message>
@@ -6863,17 +7462,7 @@ Also check your ports!</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Todos los campos requieren como mínimo 3 letras</translation>
     </message>
@@ -6883,12 +7472,17 @@ Also check your ports!</source>
         <translation>Las contraseñas no coinciden</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation>Usar BOB</translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Esta contraseña es para PGP</translation>
@@ -6909,38 +7503,50 @@ Also check your ports!</source>
         <translation>¡Fallo al generar su nuevo certificado, quizá la contraseña PGP está mal!</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <source>Options</source>
+        <translation type="vanished">Opciones</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation>Tamaño de la clave PGP</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Introduzca aquí una contraseña robusta. ¡Esta contraseña protege la clave privada de su nodo!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Por favor, mueva su ratón al azar para adquirir tanta aleatoriedad como sea posible. Se necesita un mínimo del 20% para crear las claves de su nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Nodo estándar</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">Nodo oculto TOR/I2P</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nombre de su nodo designa la instancia de RetroShare que&lt;/p&gt;&lt;p&gt;se ejecutará en esta máquina.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <source>Use existing profile</source>
+        <translation type="vanished">Usar perfil existente</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Nombre del nodo</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6960,12 +7566,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El nombre del perfil le identifica en la red.&lt;/p&gt;&lt;p&gt;Es usado por sus amigos para aceptar conexiones de usted.&lt;/p&gt;&lt;p&gt;Puede crear múltiples nodos de RetroShare con el&lt;/p&gt;&lt;p&gt;mismo perfil en distintas máquinas.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Exportar este perfil</translation>
     </message>
@@ -6975,43 +7581,42 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esto debe ser una dirección onion de Tor con la forma: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;o una dirección I2P con la forma: [52 caracteres].b32.i2p &lt;/p&gt;&lt;p&gt;Para obtener una, tiene que configurar Tor o bien I2P para crear un nuevo servicio oculto / túnel de servidor. &lt;/p&gt;&lt;p&gt; También puede dejar esto en blanco ahora, pero su nodo sólo funcionará si establece correctamente la dirección del servicio Tor/I2P en el panel de configuración Opciones-&amp;gt;Red-&amp;gt;Servicio oculto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Las identidades se usan cuando escribe en salas de chat, foros y comentarios de canal.&lt;/p&gt;&lt;p&gt;También reciben/envían correo electrónico sobre la red RetroShare. Puede crear&lt;/p&gt;&lt;p&gt;ahora una identidad firmada, o hacerlo más tarde cuando le sea necesaria.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>¡Vamos!</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation>EtiquetaTexto</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Opciones avanzadas</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>dirección oculta</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Su perfil está asociado con un par de claves PGP. RetroShare actualmente ignora las claves DSA.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este es su puerto de conexión.&lt;/p&gt;&lt;p&gt;Cualquier valor entre 1024 y 65535 &lt;/p&gt;&lt;p&gt;debería estar bien. Puede cambiarlo más tarde.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7059,13 +7664,13 @@ y usar el botón Importar para cargarlo</translation>
         <translation>Su perfil no fue guardado. Ocurrió un error.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Perfil importado</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Crear nuevo perfil y nuevo nodo RetroShare</translation>
     </message>
@@ -7075,7 +7680,7 @@ y usar el botón Importar para cargarlo</translation>
         <translation>Crear nuevo nodo RetroShare</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation>Dirección Tor/I2P</translation>
     </message>
@@ -7110,7 +7715,7 @@ y usar el botón Importar para cargarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7120,7 +7725,12 @@ y usar el botón Importar para cargarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La creación de nodo está deshabilitada hasta que todos los campos estén establecidos correctamente.&lt;/p&gt;</translation>
     </message>
@@ -7130,7 +7740,12 @@ y usar el botón Importar para cargarlo</translation>
         <translation>&lt;p&gt;La creación de nodo está deshabilitada hasta que se recoja suficiente aleatoriedad. Por favor, mueva su ratón hasta que alcance al menos el 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation>Dirección de instancia de I2P con BOB habilitado</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation>Dirección de instancia de I2P</translation>
     </message>
@@ -7356,13 +7971,36 @@ y usar el botón Importar para cargarlo</translation>
         <translation>Primeros pasos</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Invitar a los amigos</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+ &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:12pt;&quot;&gt;RetroShare no es nada sin sus amigos. Pulse en el botón para iniciar el proceso.&lt;/span&gt;&lt;/p&gt;
+ &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Envíe por correo electrónico una invitación con su &amp;quot;Certificado ID&amp;quot; a sus amigos.&lt;/span&gt;&lt;/p&gt;
+ &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Asegúrese de obtener de vuelta la invitación de su amigo... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Sólo puede conectarse con amigos, si se han añadido unos a otros.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Añadir a sus amigos a RetroShare</translation>
     </message>
@@ -7372,103 +8010,136 @@ y usar el botón Importar para cargarlo</translation>
         <translation>Añadir amigos</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Conectar con amigos</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&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;
+&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:12pt;&quot;&gt;¡Permanezca conectado al mismo tiempo que sus amigos, y Retroshare conectará automáticamente con usted!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Su cliente necesita encontrar la red Retroshare antes de poder hacer conexiones.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Esto lleva entre 5-30 minutos la primera vez que inicie Retroshare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;El indicador de la DHT (en la barra de estado) se vuelve verde cuando puede realizar conexiones.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Tras un par de minutos, el indicador de NAT (también en la barra de estado) cambia a amarillo o verde.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Si permanece rojo, entonces tiene un cortafuegos molesto, con el que RetroShare lucha para conectar a través de él.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Vea la sección Ayuda Adicional para más recomendaciones sobre cómo conectar.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;/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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&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;
 &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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avanzado: Abrir el puerto del cortafuegos</translation>
+&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:12pt;&quot;&gt;Puede mejorar su rendimiento de Retroshare abriendo un puerto externo. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Esto acelerará las conexiones y permitirá a más personas conectar con usted. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;La forma más fácil de hacer esto es habilitando UPnP en su dispositivo inalámbrico o router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Como cada router es diferente, necesitará averiguar el modelo de su router y buscar las instrucciones en Internet.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Si nada de esto tiene sentido para usted, no se preocupe por ello, Retroshare todavía funcionará.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&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;
+&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:12pt;&quot;&gt;¿Tiene problemas iniciándose con RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Mire al wiki de preguntas frecuentes (FAQ). Este es un poco antiguo, estamos tratando de actualizarlo.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Revise los foros en línea. Formule preguntas y discuta características.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Pruebe en los foros internos de RetroShare &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- Estos entran en línea una vez este conectado a amigos.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) Si aún está estancado, escríbanos un correo.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Disfrute del Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Conectar con amigos</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&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;
+&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:12pt;&quot;&gt;Cuando sus amigos le envíen invitaciones, pulse para abrir la ventana Añadir Amigos.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Pegue los &amp;quot;Certificados de identificación&amp;quot; de sus amgios en la ventana y añádalos como amigos.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avanzado: Abrir el puerto del cortafuegos</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Más ayuda y soporte técnico</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Abrir sitio web de RS</translation>
     </message>
@@ -7493,7 +8164,7 @@ p, li { white-space: pre-wrap; }
         <translation>Email para enviar comentarios</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>Invitación de RetroShare</translation>
     </message>
@@ -7543,12 +8214,12 @@ p, li { white-space: pre-wrap; }
         <translation>Comentarios de RetroShare</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>Soporte de RetroShare</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Tiene muchas características, incluyendo un chan integrado, mensajería,</translation>
     </message>
@@ -7672,7 +8343,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Mostrar chat de grupo</translation>
     </message>
@@ -7680,7 +8351,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[Desconocido]</translation>
     </message>
@@ -7846,11 +8517,19 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Puede dejar que sus amigos sepan de su foro al compartirlo con ellos. Seleccione a los amigos con los que quiera compartir su foro.</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">Compartir permisos de administrador del hilo</translation>
+    </message>
+    <message>
+        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
+        <translation type="vanished">Puede permitir que sus amigos editen el hilo. Selecciónelos en la lista de debajo. Nota: No es posible revocar permisos de administrador de Posted.</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Título</translation>
     </message>
@@ -7863,12 +8542,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7893,7 +8572,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">Ordenar en orden descendente</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">Ordenar en orden ascendente</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">Ordenar por nombre</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Ordenar por popularidad</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Ordenar por última entrada</translation>
+    </message>
+    <message>
+        <source>Sort by Number of Posts</source>
+        <translation type="vanished">Ordenar por número de mensajes</translation>
+    </message>
+    <message>
+        <source>Sort by Unread</source>
+        <translation type="vanished">Ordenar por no leídos</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Usted es administrador (modifique nombres y descripciones usando el menú Editar)</translation>
     </message>
@@ -7908,14 +8615,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Última publicación</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
@@ -7926,13 +8633,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularidad</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Mostrar</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7945,7 +8656,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>y</translation>
     </message>
@@ -8081,7 +8792,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Canales</translation>
@@ -8092,22 +8803,26 @@ p, li { white-space: pre-wrap; }
         <translation>Crear canal</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Activar descarga automática</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Mis canales</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Canales&lt;/h1&gt;        &lt;p&gt;Los canales le permiten publicar datos (ej. películas, música) que se diseminarán por la red&lt;/p&gt;                &lt;p&gt;Puede ver los canales a los que están suscritos sus amigos, y reenviar automáticamente los canales a los que esté suscrito a sus amigos. Esto promueve buenos canales en la red.&lt;/p&gt;    &lt;p&gt;Sólo el creador del canal puede publicar en ese canal. Otros vecinos en la red sólo pueden leer de él, a no ser que el canal sea privado. Sin embargo, puede compartir los derechos de publicación o lectura con nodos RetroShare amigos.&lt;/p&gt;	 &lt;p&gt;Los canales pueden hacerse anónimos, o ligados a una identidad de RetroShare de forma que los lectores puedan contactar con usted si lo necesitan.	 Habilite &quot;Permitir comentarios&quot; si quiere permitir a los usuarios comentar en sus posts.&lt;/p&gt;    &lt;p&gt;Los posts de canal se conservan durante %1 días, y se sincronizan para los últimos %2 días, a menos que cambie esto.&lt;/p&gt;                </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Canales suscritos</translation>
     </message>
@@ -8127,12 +8842,12 @@ p, li { white-space: pre-wrap; }
         <translation>Seleccione el directorio de descarga del canal</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Desactivar descarga automática</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>Establecer directorio de descarga</translation>
     </message>
@@ -8167,22 +8882,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Reproducir</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Abrir carpeta</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -8202,17 +8917,17 @@ p, li { white-space: pre-wrap; }
         <translation>Comprobando</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>¿Está seguro de que quiere cancelar y borrar el archivo?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>No se pudo abrir la carpeta</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Reproducir archivo</translation>
     </message>
@@ -8222,10 +8937,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Archivo %1 no está en ese lugar.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulario</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Nombre del archivo</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Tamaño</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Título</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Publicado</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Estado</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Crear nuevo canal</translation>
     </message>
@@ -8263,19 +9005,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Suscribirse al canal</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8289,7 +9021,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -8304,7 +9036,7 @@ p, li { white-space: pre-wrap; }
         <translation>Descripción del canal</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Cargando</translation>
     </message>
@@ -8319,9 +9051,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">Nunca</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Nuevo canal</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8332,7 +9063,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Nuevo comentario:</translation>
     </message>
@@ -8353,7 +9084,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
@@ -8409,24 +9140,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Archivos</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">¡Aviso! Tiene menos de %1 horas y %2 minutos antes que este archivo sea eliminado, considere la posibilidad de guardarlo.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Comentario</translation>
     </message>
@@ -8441,17 +9176,21 @@ p, li { white-space: pre-wrap; }
         <translation>Esto no me gusta</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Cargando</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation>Comentarios</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8476,16 +9215,139 @@ p, li { white-space: pre-wrap; }
         <translation>Reproducir medio</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Mensaje al canal</translation>
+    </message>
+    <message>
+        <source>Add new post</source>
+        <translation type="vanished">Añadir nuevo mensaje</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Cargando</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Buscar canales</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Título</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Buscar por título</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Mensaje</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Buscar mensaje</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Nombre del archivo</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Buscar nombre de archivo</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Ningún canal seleccionado</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Nunca</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Público</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle &quot;</source>
+        <translation type="vanished">Restringido a los miembros del círculo &quot;</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle </source>
+        <translation type="vanished">Restringido a los miembros del círculo</translation>
+    </message>
+    <message>
+        <source>Your eyes only</source>
+        <translation type="vanished">Sólo para sus ojos</translation>
+    </message>
+    <message>
+        <source>You and your friend nodes</source>
+        <translation type="vanished">Usted y sus nodos amigos</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Desactivar descarga automática</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Activar descarga automática</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Mostrar novedades (feeds)</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Mostrar archivos</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Administrador:</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Último post:</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">desconocido</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Distribución:</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Novedades (feeds)</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Archivos</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Suscriptores</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descripción:</translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">Publicaciones (en nodos vecinos):</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Mensaje al canal</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished">Añadir nuevo mensaje</translation>
     </message>
@@ -8555,7 +9417,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8591,7 +9453,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Comentarios</translation>
     </message>
@@ -8606,13 +9468,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Novedades (feeds)</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8627,7 +9489,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8642,7 +9504,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8702,22 +9564,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8792,13 +9644,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Usted y sus nodos amigos</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Suscrito</translation>
     </message>
@@ -8849,17 +9700,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8879,11 +9730,27 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Eliminar elemento</translation>
     </message>
+    <message>
+        <source>for identity </source>
+        <translation type="vanished">para la identidad</translation>
+    </message>
+    <message>
+        <source>You received a membership request for circle:</source>
+        <translation type="vanished">Ha recibido una solicitud de membresía para el círculo:</translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Conceder solicitud de membresía</translation>
     </message>
+    <message>
+        <source>Revoke membership request</source>
+        <translation type="vanished">Revocar solicitud de membresía</translation>
+    </message>
+    <message>
+        <source>You received an invitation for circle:</source>
+        <translation type="vanished">Ha recibido una invitación para el círculo:</translation>
+    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -8974,7 +9841,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Comentarios aquí</translation>
     </message>
@@ -8987,7 +9854,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9017,7 +9884,7 @@ p, li { white-space: pre-wrap; }
         <translation>Refrescar</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Comentario</translation>
@@ -9056,7 +9923,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Responder al comentario</translation>
     </message>
@@ -9080,21 +9947,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Votar negativo</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9104,7 +9956,7 @@ p, li { white-space: pre-wrap; }
         <translation>Hacer comentario</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9133,10 +9985,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Comentario&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Firmado por</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9164,7 +10028,7 @@ before you can comment</source>
         <translation>Es necesario crear una identidad⏎ antes de poder comentar</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9206,6 +10070,14 @@ before you can comment</source>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Añadir administradores al foro</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Seleccionar administradores del foro</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9215,7 +10087,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Suscribirse al foro</translation>
     </message>
@@ -9231,7 +10103,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -9251,9 +10123,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Cargando</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9284,13 +10155,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Tema:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Anular suscripción al foro</translation>
     </message>
@@ -9301,7 +10172,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -9321,17 +10192,21 @@ before you can comment</source>
         <translation>En respuesta a:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Cargando</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Novedad (feed) del canal</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
@@ -9344,66 +10219,63 @@ before you can comment</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Iniciar nuevo tema para el foro seleccionado</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Buscar foros</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Último mensaje</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation>Nuevo hilo</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Vista por discusión</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Vista plana</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Guardar imagen</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Cargando</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9413,7 +10285,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Responder mensaje</translation>
     </message>
@@ -9437,6 +10314,10 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Descargar todos los archivos</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Siguiente no leído</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9453,23 +10334,35 @@ before you can comment</source>
         <translation>Buscar por autor</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Contenido</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Buscar por contenido</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Suscribiendose al foro reunirá 	                                        los posts disponibles de los amigos a los que esté suscrito, y hará el 	                                        foro visible al resto de sus amigos.&lt;/p&gt;&lt;p&gt;Posteriormente puede desuscribirse desde el menú contextual de la lista del foro a la izquierda.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Responder</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9512,12 +10405,20 @@ before you can comment</source>
         <translation>Copiar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Expandir</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Excluido]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[desconocido]</translation>
     </message>
@@ -9547,8 +10448,8 @@ before you can comment</source>
         <translation>Sólo para sus ojos</translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation>Distribución</translation>
     </message>
@@ -9562,6 +10463,26 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation>Anti-spam</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Mensaje redactado ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anónimo</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">firmado</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">ninguno</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Mensaje perdido ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9631,12 +10552,16 @@ before you can comment</source>
         <translation>Mensaje original</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation>Nuevo hilo</translation>
     </message>
     <message>
-        <location line="+331"/>
+        <source>Read status</source>
+        <translation type="vanished">Estado de lectura</translation>
+    </message>
+    <message>
+        <location line="+318"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
@@ -9697,7 +10622,7 @@ before you can comment</source>
         <translation>Reputación del autor</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9717,7 +10642,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Posts anónimos/desconocidos reenviados si la reputación es positiva</translation>
     </message>
@@ -9769,7 +10694,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9779,7 +10704,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9794,7 +10719,30 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <source>Information for this identity is currently missing.</source>
+        <translation type="vanished">La información para esta identidad actualmente está desaparecida.</translation>
+    </message>
+    <message>
+        <source>You have banned this ID. The message will not be
+displayed nor forwarded to your friends.</source>
+        <translation type="vanished">Ha excluido esta identificación. El mensaje no será
+mostrado ni reenviado a sus amigos.</translation>
+    </message>
+    <message>
+        <source>You have not set an opinion for this person,
+ and your friends do not vote positively: Spam regulation 
+prevents the message to be forwarded to your friends.</source>
+        <translation type="vanished">No ha establecido una opinión para esta persona,
+y sus amigos no la han votado positivamente: La
+regulación de spam evita que este mensaje sea
+reenviado a sus amigos.</translation>
+    </message>
+    <message>
+        <source>Message will be forwarded to your friends.</source>
+        <translation type="vanished">El mensaje será reenviado a sus amigos.</translation>
+    </message>
+    <message>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation>(Más reciente)</translation>
     </message>
@@ -9803,6 +10751,10 @@ This message is missing. You should receive it later.</source>
         <source>(Old) </source>
         <translation>(Antiguo)</translation>
     </message>
+    <message>
+        <source>You cant act on the author to a non-existant Message</source>
+        <translation type="vanished">No puede actuar sobre el autor de un mensaje no-existente</translation>
+    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -9860,12 +10812,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Foros&lt;/h1&gt;               			&lt;p&gt;Los foros de RetroShare se parecen a los foros de Internet, pero funcionan de forma descentralizada&lt;/p&gt;    			&lt;p&gt;Puede ver los foros a los que están suscritos sus amigos, y reenviar los foros a los que esté suscrito      			a sus amigos. Esto automáticamente promueve foros interesantes en la red.&lt;/p&gt;                        &lt;p&gt;Los mensajes del foro se conservan durante %1 días y sincronizan para los últimos dos días, a menos que lo configure de otro modo.&lt;/p&gt;                </translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Foros</translation>
@@ -9896,16 +10848,35 @@ This message is missing. You should receive it later.</source>
         <translation>Otros foros</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Esperando</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Recuperando</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Cargando</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Añadir icono</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Los destinatarios de la clave pueden publicar en grupos de tipo restringido, y pueden ver y publicar en canales de tipo privado</translation>
     </message>
@@ -9914,14 +10885,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Compartir clave de publicación</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">marque los vecinos con los que desea compartir la clave privada de publicación</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Compartir clave con</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Distribución del mensaje</translation>
     </message>
@@ -9929,7 +10908,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Público</translation>
     </message>
@@ -9948,6 +10927,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nuevo hilo</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Requerido</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Mensajes cifrados</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9989,7 +10976,7 @@ This message is missing. You should receive it later.</source>
         <translation>Protección-del-spam</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Comentarios:</translation>
     </message>
@@ -10012,7 +10999,7 @@ This message is missing. You should receive it later.</source>
         <translation>Anti-spam:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10028,12 +11015,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation>Restringido al círculo:</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation>Limitado a sus amigos</translation>
     </message>
@@ -10050,23 +11037,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>Rastreo de mensaje</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>Se requiere firma PGP</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Nunca</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation>Sólo nodos amigos en el grupo</translation>
     </message>
@@ -10082,28 +11069,30 @@ This message is missing. You should receive it later.</source>
         <translation>Por favor añadir un nombre</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>Se requiere firma PGP de identificación conocida</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Cargar el logo del grupo</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Enviar cambios del grupo</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Fallo al preparar Metadatos del grupo - por favor revise</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Se usará para enviar comentarios</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Propietario:</translation>
     </message>
@@ -10113,12 +11102,12 @@ This message is missing. You should receive it later.</source>
         <translation>Configure una descripción explicativa aquí</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10128,7 +11117,7 @@ This message is missing. You should receive it later.</source>
         <translation>Último mensaje</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Los mensajes se difundirán mucho más allá de los nodos de sus amigos, mientras la gente se suscriba al canal/foro/posted que está creando.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -10203,12 +11192,7 @@ This message is missing. You should receive it later.</source>
         <translation>Desfavorecer identificaciones no firmadas e identificaciones desde nodos desconocidos</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Popularidad</translation>
     </message>
@@ -10224,22 +11208,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Autor</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>GxsEtiquetaIdentificación</translation>
     </message>
@@ -10247,7 +11236,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Cargando</translation>
     </message>
@@ -10307,7 +11296,7 @@ This message is missing. You should receive it later.</source>
         <translation>Editar detalles</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation>Sincronizar posts de los últimos...</translation>
     </message>
@@ -10364,12 +11353,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <source>Share publish permissions</source>
+        <translation type="vanished">Compartir permisos de publicación</translation>
+    </message>
+    <message>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Copiar enlace de RetroShare</translation>
     </message>
@@ -10392,7 +11385,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Sin Firma</translation>
     </message>
@@ -10405,24 +11398,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Cargando</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>No encontrado</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Sin Firma</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Excluido]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Autentificación</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>clave desconocida</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">anónimo</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10432,12 +11441,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Nombre&amp;nbsp;de&amp;nbsp;identidad</translation>
     </message>
@@ -10451,20 +11455,16 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished">Nodo</translation>
     </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">Firmado&amp;nbsp;por</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Desconocida]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10476,7 +11476,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10524,13 +11524,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Cargando</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10647,6 +11651,10 @@ This message is missing. You should receive it later.</source>
         <source>Group ID / Author</source>
         <translation>Identificación del grupo / Autor</translation>
     </message>
+    <message>
+        <source>Number of messages / Publish TS</source>
+        <translation type="vanished">Número de mensajes / Publicar estadísticas de transporte</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -10662,6 +11670,10 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation>Popularidad</translation>
     </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Detalles</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -10694,6 +11706,41 @@ This message is missing. You should receive it later.</source>
         <translation>No</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">Túneles autentificados:</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">Identificador de túnel: %1</translation>
+    </message>
+    <message>
+        <source>from: %1</source>
+        <translation type="vanished">de: %1</translation>
+    </message>
+    <message>
+        <source>to: %1</source>
+        <translation type="vanished">a: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">estado: %1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">total envd: %1 bytes</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">total recb: %1 bytes</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Vecino desconocido</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10906,12 +11953,48 @@ This message is missing. You should receive it later.</source>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare es una plataforma de comunicación descentralizada &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;multi-sistema, descentralizada, privada y segura.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Le permite compartir de forma segura con sus amigos, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;usando un web-of-trust para autentificar vecinos y OpenSSL para cifrar toda la comunicación. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare proporciona compartición de ficheros, chat, mensajes y canales&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;Enlaces externos útiles para mayor información:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Página web de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Wiki de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Foro de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Página del proyecto RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Blog del equipo de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Twitter de desarrollo de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+37"/>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10927,7 +12010,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Autores</translation>
     </message>
@@ -10946,7 +12029,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10959,6 +12042,36 @@ 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traducciones de RetroShare:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traductores del sitio web de RetroShare:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Sueco: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Alemán: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polaco: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -11020,34 +12133,50 @@ p, li { white-space: pre-wrap; }
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+121"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copia tu ID de RetroShare al portapapeles&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+158"/>
         <source>Add friend</source>
-        <translation>Agregar amigo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
-        <translation>¿Recibiste una identificación de Retroshare de una amiga?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+85"/>
         <source>Do you need help with Retroshare?</source>
-        <translation>¿Necesitas ayuda con Retroshare?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Comparte tu ID de RetroShare&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-63"/>
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
-        <translation>Este es tu ID de Retroshare. ¡Cópialo y compártelo con tus amigos!</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Did you receive a certificate from a friend?</source>
+        <translation type="vanished">¿Ha recibido un certificado de un amigo?</translation>
+    </message>
+    <message>
+        <source>Add friends certificate</source>
+        <translation type="vanished">Añadir certificado de amigos</translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">Añadir fichero de certificado</translation>
+    </message>
+    <message>
+        <source>Share your RetroShare Key</source>
+        <translation type="vanished">Compartir su clave de RetroShare</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11055,6 +12184,10 @@ p, li { white-space: pre-wrap; }
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
+        <translation type="vanished">El texto de debajo es su propio certificado de RetroShare. Envíeselo a sus amigos</translation>
+    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -11064,12 +12197,20 @@ private and secure decentralized communication platform.
 de código abierto, multi-sistema, privada y segura.</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <source>Launch startup wizard</source>
+        <translation type="vanished">Iniciar asistente de arranque</translation>
+    </message>
+    <message>
+        <source>Do you need help with RetroShare?</source>
+        <translation type="vanished">¿Necesita ayuda con RetroShare?</translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>Open Web Help</source>
         <translation>Ayuda de Open Web</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Copiar su certificado al portapapeles</translation>
     </message>
@@ -11079,7 +12220,7 @@ de código abierto, multi-sistema, privada y segura.</translation>
         <translation>Guardar su certificado en un fichero</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>Enviar vía correo electrónico</translation>
     </message>
@@ -11096,40 +12237,16 @@ de código abierto, multi-sistema, privada y segura.</translation>
     <message>
         <location line="+6"/>
         <source>Copy your Retroshare ID to Clipboard</source>
-        <translation>Copia tu ID de Retroshare al portapapeles</translation>
-    </message>
-    <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11141,12 +12258,17 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+16"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11155,11 +12277,19 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;¡Bienvenido a RetroShare!&lt;/h1&gt;   &lt;p&gt;¡Necesita hacer &lt;b&gt;hacer amigos&lt;/b&gt;! Después de que cree una red de amigos o se una a una red existente,	  podrá intercambiar ficheros, chatear, hablar en foros, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;Para hacerlo así, copie su certificado en esta página y envíelo a los amigos, y añada el certificado de sus amigos.&lt;/p&gt;    &lt;p&gt;Otra opción es buscar en Internet por &quot;servidores de chat de RetroShare&quot; (administrados independientemente). Estos servidores le permite intercambiar 	certificados con un nodo dedicado de RetroShare, a través del cual	 podrá encontrarse anónimamente con otras personas.&lt;/p&gt; </translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Invitación de RetroShare</translation>
     </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Su certificado se copia al Portapapeles, pegue y envíeselo a su amigo por correo electrónico o de algún otro modo</translation>
+    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -11173,7 +12303,7 @@ new short format</source>
     <message>
         <location filename="../gui/HomePage.h" line="+46"/>
         <source>Home</source>
-        <translation>Casa</translation>
+        <translation>Página principal</translation>
     </message>
 </context>
 <context>
@@ -11431,14 +12561,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Reputación</translation>
     </message>
@@ -11448,12 +12578,12 @@ p, li { white-space: pre-wrap; }
         <translation>Buscar</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>ID anónima</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Crear nueva identidad</translation>
     </message>
@@ -11463,7 +12593,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crear nuevo círculo</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>Personas</translation>
     </message>
@@ -11478,27 +12608,27 @@ p, li { white-space: pre-wrap; }
         <translation>Persona</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation>Opción de exclusión:</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Auto-excluir todas las identidades firmadas por el mismo nodo</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation>Votos de amigos:</translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Votos positivos</translation>
     </message>
@@ -11514,39 +12644,29 @@ p, li { white-space: pre-wrap; }
         <translation>Votos negativos</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
-        <translation>Creado el :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation>Perfil de prohibición automática</translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation>Editar identidad</translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation>Estadísticas de uso</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Círculos</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Nombre del círculo</translation>
     </message>
@@ -11566,20 +12686,18 @@ p, li { white-space: pre-wrap; }
         <translation>Círculos personales</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Editar identidad</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Borrar indentidad</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Charlar con este vecino</translation>
     </message>
@@ -11589,78 +12707,98 @@ p, li { white-space: pre-wrap; }
         <translation>Abre un chat a distancia con este vecino</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
-        <translation>Identificación del nodo:</translation>
+        <translation>Identificación del nodo propietario :</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
-        <translation>Nombre de identidad:</translation>
+        <translation>Nombre de la identidad :</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>Identificación de la identidad</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Enviar mensaje</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Información de la identidad</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Identificación de la identidad :</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Nombre del nodo propietario :</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation>Crear nueva...</translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Enviar invitación</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La opinión media de los nodos vecinos acerca de esta identidad. Negativo es malo,&lt;/p&gt;&lt;p&gt;positivo es bueno. Cero es neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>Su opinión:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Su propia opinión acerca de una identidad rige la visibilidad de esa identidad para si mismo y los nodos de sus amigos. Su propia opinión es compartida entre amgios y usada para calcular una puntuación de reputación: Si su opinión acerca de una identidad es neutral, la puntuación de reputación es la diferencia entre las opiniones positivas y negativas del amigo. Si no, su propia opinión proporciona la puntuación.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La puntuación global se usa en salas de chat, foros y canales para decidir sobre las acciones a tomar para cada identidad específica. Cuando la puntuación global es menor que -1, la identidad es excluida, lo que evita que sean reenviados todos los mensajes y foros/canales cuya autoría pertenezca a esta identidad, en ambos sentidos. Algunos foros también tienen indicativos anti-spam especiales que requieren un nivel de reputación no negativo, y eventualmente desaparecen (tras 5 días).&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Puede cambiar los umbrales y el tiempo de inactividad para eliminar identidades en Preferencias -&amp;gt; Personas. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Negativo</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>Neutral</translation>
     </message>
@@ -11671,17 +12809,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positivo</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Puntuación de reputación global, contando la suya y las de sus amigos.&lt;/p&gt;&lt;p&gt;Negativo es malo, positivo es bueno, cero es neutral. Si la puntuación es demasiado baja,&lt;/p&gt;&lt;p&gt;la identidad se señalará como mala, y será rechazada en foros, salas de chat,&lt;/p&gt;&lt;p&gt;canales, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Global:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anónimo</translation>
     </message>
@@ -11696,24 +12834,24 @@ p, li { white-space: pre-wrap; }
         <translation>Buscar identificación</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Esta identidad es propiedad de usted</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>Mis propias identidades</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>Mis contactos</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation>Mostrar elementos</translation>
     </message>
@@ -11728,12 +12866,7 @@ p, li { white-space: pre-wrap; }
         <translation>Enlazado a mi nodo</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>Otros círculos</translation>
     </message>
@@ -11743,7 +12876,7 @@ p, li { white-space: pre-wrap; }
         <translation>Círculos a los que pertenezco</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>Identificación del círculo:</translation>
     </message>
@@ -11818,7 +12951,7 @@ p, li { white-space: pre-wrap; }
         <translation>No es miembro (no tiene acceso a datos limitados a este círculo)</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>Identificación de identidad:</translation>
     </message>
@@ -11848,7 +12981,7 @@ p, li { white-space: pre-wrap; }
         <translation>desconocido</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>Invitado</translation>
     </message>
@@ -11863,7 +12996,7 @@ p, li { white-space: pre-wrap; }
         <translation>Miembro</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>Editar círculo</translation>
     </message>
@@ -11911,7 +13044,7 @@ p, li { white-space: pre-wrap; }
         <translation>Conceder membresía</translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11922,7 +13055,7 @@ Debe deshacerse de ella ahora y usar una nueva.
 Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Nodo desconocido]</translation>
@@ -11965,7 +13098,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Identidad anónima</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12045,7 +13178,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation>información</translation>
     </message>
@@ -12061,12 +13194,29 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Copiar identidad al portapapeles</translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <source>Send invite?</source>
+        <translation type="vanished">¿Enviar invitación?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">¿Está seguro de que quiere enviar una invitación con su certificado?</translation>
+    </message>
+    <message>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Excluido</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identidades&lt;/h1&gt;    			&lt;p&gt;En esta pestaña puede crear/editar &lt;b&gt;identidades pseudo-anónimas&lt;/b&gt;, y &lt;b&gt;círculos&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;Las &lt;b&gt;identidades&lt;/b&gt; se usan para identificar sus datos de forma segura: firmar mensajes en salas de chat, foros y posts en canales,			recibir comentarios usando el sistema de correo electrónico integrado de RetroShare, comentarios publicados 				tras los posts en los canales, chat usando túneles seguros, etc.&lt;/p&gt; 			&lt;p&gt;Las identidades opcionalmente pueden estar &lt;b&gt;firmadas&lt;/b&gt; por el certificado de su nodo RetroShare.   			Es más fácil confiar en las identidades firmadas pero son más fácilmente vinvulables con la dirección IP de su nodo.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Unknown ID:</source>
+        <translation type="vanished">Identidad desconocida:</translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation>positivo</translation>
     </message>
@@ -12110,11 +13260,19 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>Forums</source>
         <translation>Foros</translation>
     </message>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Posted</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Desconocido</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12135,6 +13293,14 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>Creación de firma del autor en servicio %1</translation>
     </message>
+    <message>
+        <source>Message/vote/comment</source>
+        <translation type="vanished">Mensaje/voto/comentario</translation>
+    </message>
+    <message>
+        <source>%1 in %2 tab</source>
+        <translation type="vanished">%1 en la pestaña %2</translation>
+    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12155,11 +13321,19 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Firma en sistema de túnel distante.</translation>
     </message>
+    <message>
+        <source>Update of identity data.</source>
+        <translation type="vanished">Actualizar datos de identidad.</translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Validación de firma genérica.</translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">Firma genérica.</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12171,7 +13345,11 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Descifrado genérico.</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <source>Membership verification in circle %1.</source>
+        <translation type="vanished">Verificación de membresía en el círculo %1.</translation>
+    </message>
+    <message>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation>Añadir a contactos</translation>
     </message>
@@ -12221,21 +13399,21 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Hola,&lt;br&gt;quiero que seamos amigos en RetroShare.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Personas</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Su avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>Enlazado hacia nodos vecinos</translation>
     </message>
@@ -12245,7 +13423,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Enlazado hacia nodos distantes</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Enlazado hacia un nodo de RetroShare amigo</translation>
     </message>
@@ -12260,7 +13438,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Enlazado hacia un nodo RetroShare desconocido</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Conversar con esta persona</translation>
     </message>
@@ -12275,12 +13453,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Conversación distante rechazada con esta persona.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>Usado por última vez:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP conocidos</translation>
     </message>
@@ -12300,12 +13478,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>¿De verdad quiere borrar esta identidad?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Propiedad de</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Nombre del nodo:</translation>
     </message>
@@ -12315,7 +13493,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Identificación del nodo:</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>¿Está seguro de borrar?</translation>
     </message>
@@ -12323,7 +13501,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
@@ -12353,7 +13531,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Seudónimo</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12363,19 +13541,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Nueva identidad</translation>
     </message>
@@ -12389,7 +13560,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12399,12 +13570,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Editar identidad</translation>
@@ -12415,27 +13581,27 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished">Actualizar</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12455,7 +13621,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12465,7 +13631,11 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">¡Error al obtener la clave!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Error, ID de la clave no válida</translation>
     </message>
@@ -12480,7 +13650,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Nombre real desconocido</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Crear nueva identidad</translation>
     </message>
@@ -12490,15 +13660,10 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12524,7 +13689,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Crear</translation>
     </message>
@@ -12534,13 +13699,17 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Su avatar</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Establecer avatar</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>Enlazado a su perfil</translation>
     </message>
@@ -12550,7 +13719,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Puede tener una o más identidades. Se usan cuando escribe un salas de chat, foros y comentarios de canales. Actúan como el destinatario para conversaciones distantes y el sistema de correo distante de RetroShare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>El apodo es demasiado corto. Por favor, introduzca al menos %1 caracteres.</translation>
     </message>
@@ -12609,6 +13778,10 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>PGP name:</source>
         <translation>Nombre de PGP:</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">Identificación de GXS:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12624,7 +13797,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -12634,12 +13807,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Quitar</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Marcar todo</translation>
     </message>
@@ -12658,38 +13831,26 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>Quote</source>
         <translation type="unfinished">Citar</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Enviar</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Guardar imagen</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>No se puede guardar la imagen, nombre de fichero no válido</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation>No es una imagen</translation>
     </message>
@@ -12707,32 +13868,27 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Puerto:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Estado:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12753,12 +13909,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12767,31 +13918,26 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Abrir carpeta</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Comprobando...</translation>
     </message>
@@ -12801,7 +13947,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Comprobar archivos</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation>Recomendar en un mensaje a...</translation>
     </message>
@@ -12829,7 +13975,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Añadir a amigo</translation>
     </message>
@@ -12845,8 +13991,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
@@ -12867,7 +14012,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Cerrar</translation>
     </message>
@@ -12878,12 +14023,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Asistente para el inicio rápido</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 es una plataforma de comunicación descentralizada y segura</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Incompleto</translation>
     </message>
@@ -12912,12 +14057,11 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Notificación</translation>
     </message>
@@ -12928,35 +14072,31 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Abrir mensajes</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Gráfico del uso de la red</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Minimizar</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Maximizar</translation>
     </message>
@@ -12971,12 +14111,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 nuevo mensaje</translation>
     </message>
@@ -13006,7 +14141,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>%1 amigos conectados</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>¿Realmente desea salir de RetroShare?</translation>
     </message>
@@ -13026,7 +14161,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Asegúrese de que este enlace no ha sido falsificado para arrastrarle a un sitio web malicioso.</translation>
     </message>
@@ -13071,13 +14206,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Matriz de permisos del servicio</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Mostrar interfaz web</translation>
     </message>
@@ -13092,7 +14226,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>directorio está descenciendo (el límite actual es</translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>¿Está seguro de salir?</translation>
     </message>
@@ -13101,17 +14235,17 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Componer</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Párrafo</translation>
     </message>
@@ -13147,12 +14281,12 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Encabezamiento 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Tamaño de letra</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Aumentar tamaño de letra</translation>
     </message>
@@ -13167,32 +14301,32 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Negrita</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Cursiva</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Alineación</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Añadir una imagen</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Cambia el estilo de letra a tipo codigo</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Subrayado</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Asunto:</translation>
     </message>
@@ -13203,32 +14337,32 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>Lista de direcciones:</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation>Recomendar este amigo</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Establecer color del texto</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Establecer color de fondo</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Archivos recomendados</translation>
     </message>
@@ -13298,7 +14432,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Añadir cita</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Enviar a:</translation>
     </message>
@@ -13322,6 +14456,10 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <source>&amp;Justify</source>
         <translation>&amp;Justificar</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">Todas las direcciones (mezcladas)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13333,7 +14471,7 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>Mis contactos</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hola,&lt;br&gt;Le recomiendo a un buen amigo mío, puede confiar en él tanto como confía en mí. &lt;br&gt;</translation>
     </message>
@@ -13353,18 +14491,18 @@ Estas identidades pronto dejarán de estar soportadas.</translation>
         <translation>quiere ser su amigo en RetroShare</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hola %1,&lt;br&gt;&lt;br&gt;%2 quiere ser su amigo en RetroShare.&lt;br&gt;&lt;br&gt;Responder ahora:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Gracias,&lt;br&gt;El equipo de RetroShare</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Guardar mensaje</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>El mensaje no se ha enviado.
@@ -13376,17 +14514,7 @@ Do you want to save message to draft box?</source>
         <translation>Pegar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Añadir a &quot;A&quot;</translation>
     </message>
@@ -13406,7 +14534,7 @@ Do you want to save message to draft box?</source>
         <translation>Añadir como recomendado</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Mensaje original</translation>
     </message>
@@ -13416,21 +14544,21 @@ Do you want to save message to draft box?</source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Enviar</translation>
     </message>
@@ -13445,7 +14573,7 @@ Do you want to save message to draft box?</source>
         <translation>En %1, %2 escribió:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13455,30 +14583,30 @@ Do you want to save message to draft box?</source>
         <translation>Env:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>¿Quiere enviar este mensaje sin asunto?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Por favor, introduzca por lo menos un destinatario.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -13593,13 +14721,13 @@ Do you want to save message to draft box?</source>
         <translation>Detalles</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Abrir archivo...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Archivos HTML (*.htm *.html);;Todos los archivos(*)</translation>
     </message>
@@ -13619,7 +14747,7 @@ Do you want to save message to draft box?</source>
         <translation>Exportar PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>El mensaje no se ha enviado.
@@ -13641,7 +14769,7 @@ Do you want to save message ?</source>
         <translation>Añadir otro archivo</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Hola,&lt;br&gt;quiero establecer amistad contigo en RetroShare.&lt;br&gt;</translation>
     </message>
@@ -13665,24 +14793,28 @@ Do you want to save message ?</source>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">Tiene una invitación de amistad.</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Responder ahora:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>Nodos amigos</translation>
     </message>
@@ -13727,13 +14859,13 @@ Do you want to save message ?</source>
         <translation>Lista ordenada (números romanos en mayúscula)</translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Gracias, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Identidad distante:</translation>
     </message>
@@ -13743,12 +14875,12 @@ Do you want to save message ?</source>
         <translation>[Desaparecido]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Por favor, cree una identidad para firmar mensajes distantes, o elimine los vecinos distantes de la lista de destinos.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Nombre de nodo e identificación:</translation>
     </message>
@@ -13826,7 +14958,7 @@ Do you want to save message ?</source>
         <translation>Por defecto</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Una pestaña nueva</translation>
     </message>
@@ -13836,7 +14968,7 @@ Do you want to save message ?</source>
         <translation>Una ventana nueva</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Editar etiqueta</translation>
     </message>
@@ -13859,7 +14991,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Asunto:</translation>
     </message>
@@ -13867,7 +14999,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
@@ -13895,7 +15027,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Archivos recomendados</translation>
     </message>
@@ -13905,37 +15037,37 @@ Do you want to save message ?</source>
         <translation>Descargar todos los archivos recomendados</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Asunto:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Etiquetas:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Responder</translation>
     </message>
@@ -13975,7 +15107,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>Enviar invitación</translation>
     </message>
@@ -14027,7 +15159,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Confirmar %1 como amigo</translation>
     </message>
@@ -14037,12 +15169,12 @@ Do you want to save message ?</source>
         <translation>Añadir %1 como amigo</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Sin asunto</translation>
     </message>
@@ -14052,22 +15184,17 @@ Do you want to save message ?</source>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14077,23 +15204,21 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
+        <source>Send invite?</source>
+        <translation type="vanished">¿Enviar invitación?</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">¿Está seguro de que quiere enviar una invitación con su certificado?</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Dercargar todo</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Imprimir documento</translation>
     </message>
@@ -14108,12 +15233,12 @@ Do you want to save message ?</source>
         <translation>Archivos HTML (*.htm *.html);;Todos los archivos(*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Cargar siempre imágenes para este mensaje</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Ocultar el panel de adjunto</translation>
     </message>
@@ -14135,6 +15260,42 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Componer</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Responder al mensaje seleccionado</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Responder</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Responder a todos los mensajes seleccionados</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Responder a todos</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Reenviar mensaje seleccionado</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Adelante</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Borrar mensaje seleccionado</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Borrar</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Imprimir mensaje seleccionado</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14213,7 +15374,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Nuevo mensaje</translation>
     </message>
@@ -14223,16 +15384,60 @@ Do you want to save message ?</source>
         <translation>Componer</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Responder a mensaje seleccionado</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Responder</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Responder a todos los mensajes seleccionados</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Responder a todos</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Reenviar mensaje seleccionado</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Reenviar</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Borrar mensaje seleccionado</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Borrar</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Imprimir mensaje seleccionado</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Imprimir</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Mostrar</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Bandeja de entrada</translation>
@@ -14262,17 +15467,21 @@ Do you want to save message ?</source>
         <translation>Papelera</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Buzón de entrada total:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Carpetas</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Vista rápida</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Imprimir...</translation>
@@ -14282,6 +15491,26 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>Vista previa</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Botones solo con icono</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Botones con texto al lado del icono</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Botones con texto</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Botones con texto debajo del icono</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Poner texto debajo de los iconos</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14303,7 +15532,7 @@ Do you want to save message ?</source>
         <translation>Reenviar mensaje</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
@@ -14313,7 +15542,7 @@ Do you want to save message ?</source>
         <translation>De</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
@@ -14323,7 +15552,39 @@ Do you want to save message ?</source>
         <translation>Contenido</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Pulsar para ordenar por adjuntos</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Pulsar para ordenar por asunto</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Pulsar para ordenar por leido</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Pulsar para ordenar por remitente</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Pulsar para ordenar por fecha</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Pulsar para ordenar por etiqueta</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Pulsar para ordenar por estrella</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Reenviar mensaje seleccionado</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Buscar por el asunto</translation>
     </message>
@@ -14332,11 +15593,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Buscar desde</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14363,14 +15619,14 @@ Do you want to save message ?</source>
         <translation>Buscar por adjuntos</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;RetroShare tiene su propio sistema interno de correo electrónico. Puede recibir/enviar correos de/a nodos amigos conectados.&lt;/p&gt;  &lt;p&gt;También es posible enviar mensajes a las identidades de otras personas usando el sistema de enrutamiento global. Estos mensajes siempre se cifran y firman, y son repetidos por nodos intermedios hasta que alcanzan su destino final. &lt;/p&gt;    &lt;p&gt;Los mensajes distantes permanecen en su Bandeja de Salida hasta que llegue un acuse de recibo.&lt;/p&gt; &lt;p&gt;Generalmente, puede usar mensajes para recomendar archivos a sus amigos pegando los enlaces de los archivos, o puede recomendar nodos amigos a otros nodos amigos para fortalecer su red, o enviar comentarios al propietario de un canal.&lt;/p&gt;                    </translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Con estrella</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14444,7 +15700,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14458,7 +15714,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14473,33 +15729,38 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Borradores</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>A</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">No hay mensajes favoritos disponibles. Las estrellas permiten dar un estatus especial a los mensajes para que sean más fáciles de encontrar. Para marcar como favorito un mensaje, pulse en la estrella gris claro al lado de cualquier mensaje.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">No hay mensajes del sistema disponibles.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">A</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Pulsar para ordenar por destinatario</translation>
+    </message>
+    <message>
+        <source>This message goes to a distant person.</source>
+        <translation type="vanished">Este mensaje va a una persona distante.</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14507,6 +15768,26 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Total:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Mensajes</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Haga clic en ordenar por firma</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Este mensaje fue firmado y la firma comprobada</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Este mensaje esta firmado, pero la firma no se ha comprobado</translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">Este mensaje viene de una persona distante.</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14534,17 +15815,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">Guardar imagen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Pegar como texto sin cifrar</translation>
     </message>
@@ -14598,7 +15869,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Abrir</translation>
     </message>
@@ -14608,7 +15879,7 @@ Do you want to save message ?</source>
         <translation>Quitar objeto</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation>de</translation>
     </message>
@@ -14643,10 +15914,18 @@ Do you want to save message ?</source>
         <translation>Mensajes pendientes</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
+    <message>
+        <source>Send invite?</source>
+        <translation type="vanished">¿Enviar invitación?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">¿Está seguro de que quiere enviar una invitación con su certificado?</translation>
+    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -14784,7 +16063,7 @@ Do you want to save message ?</source>
         <translation>ID del vecino</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Eliminar claves sin uso...</translation>
     </message>
@@ -14794,7 +16073,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Vaciar el juego de claves</translation>
     </message>
@@ -14811,13 +16090,7 @@ Nota: Se hará copia de seguridad de su viejo juego de claves.
 La eliminación puede fallar cuando se ejecutan varias instancias de Retroshare en la misma máquina.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Información del juego de claves</translation>
@@ -14853,13 +16126,18 @@ Para mayor seguridad, previamente se hizo copia de seguridad en fichero de su ju
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Inconsistencia de datos en el juego de claves. Probablemente esto es un error. Póngase en contacto con los desarrolladores.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>Exportar/crear un nuevo nodo</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Sólo claves de confianza</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Buscar nombre</translation>
     </message>
@@ -14869,12 +16147,12 @@ Para mayor seguridad, previamente se hizo copia de seguridad en fichero de su ju
         <translation>Buscar identificación del vecino</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>Detalles del perfil...</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14883,6 +16161,13 @@ Reported error:</source>
 Se informo del error:</translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Red</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14909,7 +16194,7 @@ Se informo del error:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14930,7 +16215,7 @@ Se informo del error:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Grupos</translation>
     </message>
@@ -14960,19 +16245,19 @@ Se informo del error:</translation>
         <translation type="unfinished">importar su lista de amigos incluyendo grupos</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">Buscar</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14982,12 +16267,12 @@ Se informo del error:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished">Mostrar elementos</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14997,7 +16282,7 @@ Se informo del error:</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Grupo</translation>
     </message>
@@ -15112,7 +16397,7 @@ Se informo del error:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">¿Quiere eliminar este nodo?</translation>
     </message>
@@ -15122,7 +16407,7 @@ Se informo del error:</translation>
         <translation type="unfinished">¿Quiere eliminar este amigo?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">¡Hecho!</translation>
@@ -15236,7 +16521,11 @@ al menos un vecino no fue añadido al grupo</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">Entradas de registro (log)</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15251,7 +16540,11 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Quitar todo</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Esto es una prueba.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>Los más recientes arriba</translation>
     </message>
@@ -15261,12 +16554,20 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Los más antiguos arriba</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Suscripción de noticias&lt;/h1&gt;                                                             &lt;p&gt;La suscripción de registro (log feed) muestra los últimos eventos en su red, ordenados por la hora a la que los recibió.                   Esto le proporciona un compendio de la actividad de sus amigos.                                                          Puede configurar qué eventos mostrar pulsando en &lt;b&gt;Opciones&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;Los distintos eventos mostrados son:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Intentos de conexión (útil para hacer amigos con nuevas personas y controlar quién está tratando de acceder a usted)&lt;/li&gt;    &lt;li&gt;Posts de canal y foro&lt;/li&gt;                                                                               &lt;li&gt;Nuevos canales y foros a los que puede suscribirse&lt;/li&gt;                                                          &lt;li&gt;Mensajes privados de sus amigos&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="vanished">Registro (log)</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15321,6 +16622,10 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Seguridad</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15342,6 +16647,10 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Intento de conectar</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15358,6 +16667,10 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Ip security</source>
         <translation>Seguridad de la IP</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">Registro (log)</translation>
+    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -15368,6 +16681,10 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Circles</source>
         <translation>Círculos</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Enlaces</translation>
+    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -15420,6 +16737,26 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Chat rooms</source>
         <translation>Salas de chat</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">Salas de chat</translation>
+    </message>
+    <message>
+        <source>Count occurrences of my current identity</source>
+        <translation type="vanished">Contar apariciones de mi identidad actual</translation>
+    </message>
+    <message>
+        <source>Count occurrences of any of the following texts (separate by newlines):</source>
+        <translation type="vanished">Contar apariciones de cualquiera de los siguientes textos (separar en líneas):</translation>
+    </message>
+    <message>
+        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
+        <translation type="vanished">Márquelo, si las apariciones de la identidad y el texto anterior deben coincidir en mayúsculas y minúsculas para incrementar el recuento.</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="vanished">Distingue mayúsculas y minúsculas</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15495,16 +16832,24 @@ al menos un vecino no fue añadido al grupo</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Deshabilitar todas las notificaciones temporalmente</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Novedades (feed)</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Bandeja del sistema</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">Contar todos los mensajes no leídos</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation>Se requiere frase-contraseña</translation>
     </message>
@@ -15524,12 +16869,12 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>¡Contraseña errónea!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Por favor, introduzca su frase-contraseña de RetroShare</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Plugin no registrado/ejecutable</translation>
     </message>
@@ -15544,7 +16889,19 @@ al menos un vecino no fue añadido al grupo</translation>
         <translation>Por favor, compruebe su reloj del sistema.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Examinando archivos compartidos...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Calculando hash del archivo</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Guardando indice del archivo...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Prueba</translation>
     </message>
@@ -15555,19 +16912,17 @@ al menos un vecino no fue añadido al grupo</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Título desconocido</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Mesaje criptado</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Para que las salas de chat funcionen adecuadamente, la hora de su computadora tiene que se correcta. Por favor, compruebe si este es el caso (una posible desincronización de varios minutos fue detectada con sus amigos).</translation>
     </message>
@@ -15575,7 +16930,7 @@ al menos un vecino no fue añadido al grupo</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Amigo conectado</translation>
     </message>
@@ -15627,6 +16982,10 @@ Sin Anonimato D/S: desactiva el reenvío de archivos
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Diálogo</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15692,6 +17051,10 @@ Sin Anonimato D/S: desactiva el reenvío de archivos
         <source>This profile has signed your own profile key</source>
         <translation>Este perfil ha firmado su propia clave del perfil</translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Firmas de clave :</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15721,20 +17084,23 @@ p, li { white-space: pre-wrap; }
         <translation>Clave PGP</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation>Estas opciones se aplican a todos los nodos del perfil:</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmar la clave de un amigo es una forma de expresar su confianza en este amigo al resto de sus amigos. Les ayuda a decidir si permitir conexiones desde esa clave en base a su propia confianza. Firmar una clave es absolutamente opcional y no puede deshacerse, así que hágalo con sabiduría.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Firmar clave PGP</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15771,7 +17137,12 @@ p, li { white-space: pre-wrap; }
         <translation>Incluir firmas</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Opciones</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare comprueba periódicamente las listas de su amigo en busca de ficheros navegables que coincidan con sus transferencias, para establecer una transferencia directa. En este caso, su amigo sabe que usted está descargando el fichero.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Para evitar este comportamiento, sólo para este amigo, desmarque esta casilla. Aún podrá realizar una transferencia directa si la pide explícitamente, por ejemplo, descargándolo de la lista de ficheros de su amigo. Esta configuración se aplica a todas las ubicaciones del mismo nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -15785,6 +17156,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esta opción le permite descargar automáticamente un fichero que esté recomendado en un mensaje proveniente de este nodo. Esto se puede usar, por ejemplo, para enviar ficheros entre sus propios nodos. Se aplica a todas las ubicaciones del mismo nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15817,21 +17192,21 @@ p, li { white-space: pre-wrap; }
         <translation>KB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: No se pueden obtener los detalles del vecino.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>El algoritmo de la clave proporcionada no está soportado por RetroShare
@@ -15852,7 +17227,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Advertencia: En su opción de Transferencia-de-fichero, establezca permitir descarga directa a No.</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>El nivel de confianza es una forma de expresar su propia confianza en esta clave. No es utilizado por la aplicación ni se comparte, pero puede serle útil para recordar buenas/malas claves.</translation>
     </message>
@@ -15921,6 +17296,10 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Probablemente la contraseña es errónea</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15928,12 +17307,12 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>Perfil de RetroShare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Esta es su propia clave PGP, y está firmada por:</translation>
     </message>
@@ -15959,7 +17338,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
@@ -15980,7 +17359,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>Quitar objeto</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
@@ -16020,7 +17399,7 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>Desfase temporal:</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Escribir mensaje</translation>
     </message>
@@ -16034,6 +17413,10 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>Friend Connected</source>
         <translation>Amigo conectado</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Intentando conectar</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16072,13 +17455,17 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Vecino desconocido</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Enviar mensaje</translation>
     </message>
@@ -16130,6 +17517,10 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>Chat with this person as...</source>
         <translation>Chatear con esta persona como...</translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">Enviar un mensaje a esta persona</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -16188,6 +17579,10 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cualquiera en su lista de contactos automáticamente tendrá una opinión positiva si no está establecida. Esto permite erigir automáticamente las reputaciones de los nodos usados. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
+        <translation type="vanished">dar automáticamente una opinión &quot;Positiva&quot; a mis contactos</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -16245,6 +17640,13 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Para evitar que las identificaciones borradas reaparezcan porque sean usadas, por ejemplo, en foros o canales, se conservan en una lista durante algún tiempo. Tras aquello, se &amp;quot;eliminan&amp;quot; de la lista de exclusión, y se descargarán de nuevo como no excluidas si se usan en foros, salas de chat, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulario</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16252,11 +17654,23 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>PhotoShare</source>
         <translation>Compartir fotos</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Fotografía</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Texto de la etiqueta</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Comentario</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Resumen</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16317,6 +17731,14 @@ Advertencia: En su opción de Transferencia-de-fichero, establezca permitir desc
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Añadir comentario</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Escribir un comentario...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16387,6 +17809,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Crear álbum</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Ver álbum</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16408,17 +17834,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diapositivas</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Mi álbum</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Álbum suscritos</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Álbumes compartidos</translation>
     </message>
@@ -16448,7 +17874,7 @@ solicitar editarlo!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Nombre del album</translation>
     </message>
@@ -16507,19 +17933,19 @@ solicitar editarlo!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16555,12 +17981,12 @@ solicitar editarlo!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Texto de la etiqueta</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Mostrar más detalles sobre este plugin</translation>
     </message>
@@ -16706,6 +18132,60 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Directorios de búsqueda de plugin</translation>
     </message>
+    <message>
+        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
+        <translation type="vanished">Complemento deshabilitado. Haga clic en el botón habilitar y reinicie Retroshare</translation>
+    </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[deshabilitado]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">No se ha suministrado el número del API. Por favor lea el manual de desarrollo del plugin.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[problema al cargar]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">No se ha suministrado el número del SVN. Por favor lea el manual de desarrollo del plugin.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Error cargando.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Símbolo faltante. ¿Versión incorrecta?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Ningún objeto plugin</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Los plugins están cargados.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Estado desconocido.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Marque esto para el desarrollo de plugins. Esto hará
+que no se compruebe el hash. Sin embargo, en
+condiciones normales, el control de hash le protege
+de un posible comportamiento malicioso de los plugins.</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Complementos&lt;/h1&gt;                   &lt;p&gt;Los complementos (plugins) se cargan desde los directorios que aparecen en la lista del fondo.&lt;/p&gt;                       &lt;p&gt;Por razones de seguridad, los complementos aceptados se cargan automáticamente hasta que                              el ejecutable principal de RetroShare o la librería del complemento cambian. En                                tal caso, el usuario necesita confirmarlos de nuevo.                                              Después de que se inicie el programa, puede habilitar un complemento manualmente haciendo clic en el botón               &quot;Habilitar&quot;, y luego reiniciar RetroShare.&lt;/p&gt;                                              &lt;p&gt;Si quiere desarrollar sus propios complementos, contacte con el equipo de desarrolladores                        ¡ellos estarán contentos de auxiliarle!&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16775,27 +18255,12 @@ p, li { white-space: pre-wrap; }
         <translation>Ventana de ajustes en la parte superior</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">Excluir a esta persona (establece una opinión negativa)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished">Dar una opinión neutral</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished">Dar una opinión positiva</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16829,6 +18294,22 @@ p, li { white-space: pre-wrap; }
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The person you are talking to has deleted the secured chat tunnel.</source>
+        <translation type="vanished">La persona con la está hablando ha eliminado el túnel de chat seguro.</translation>
+    </message>
+    <message>
+        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
+        <translation type="vanished">El interlocutor del chat eliminó el túnel seguro, los mensajes se entregarán tan pronto como sea posible.</translation>
+    </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Cerrando esta ventana finalizará la conversación, notifíqueselo al vecino y retire el túnel cifrado.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">¿Matar el túnel?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16848,7 +18329,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nuevo</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Votar positivo</translation>
     </message>
@@ -16868,8 +18349,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Comentarios</translation>
     </message>
@@ -16894,13 +18375,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Comentario</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished">Comentarios</translation>
     </message>
@@ -16928,12 +18409,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Firmado por:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Notas</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16948,22 +18437,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Cargar archivo de imagen</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16979,17 +18458,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16999,7 +18468,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Enviar mensaje</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">Está publicando un enlace. La clave de un envío exitoso es un contenido interesante y un título descriptivo</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Enviar</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Publicar un nuevo envío</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Por favor añada un título</translation>
     </message>
@@ -17019,22 +18504,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17049,7 +18524,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Publicar como</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17060,7 +18535,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Imágen</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17070,7 +18545,7 @@ p, li { white-space: pre-wrap; }
         <translation>Título</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Enlace</translation>
     </message>
@@ -17078,12 +18553,44 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Enlaces de Posted</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;El servicio posted le permite compartir enlaces de Internet, que se difunden entre nodos RetroShare como foros y 	 canales&lt;/p&gt; 	 &lt;p&gt;Los enlaces pueden ser comentados por usuarios suscritos. Es un sistema de promoción que también da la oportunidad de  	 ilustrar enlaces importantes.&lt;/p&gt;      &lt;p&gt;No hay restricciones en cuanto a qué enlaces se comparten. Tenga cuidado cuando pulse sobre ellos.&lt;/p&gt;    &lt;p&gt;Los enlaces de posted se conservan durante %1 días, y se sincronizan más allá de los últimos %2 días, a menos que usted cambie esto.&lt;/p&gt;                </translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Crear tema</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Mis temas</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Temas suscritos</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Temas populares</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Otros temas</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Enlaces</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17117,7 +18624,31 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Tema de Posted</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Añadir tema de administradores</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Seleccionar tema de administradores</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Crear nuevo tema</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Editar tema</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Actualizar temática</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17155,17 +18686,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>Suscribirse a Posted</translation>
     </message>
@@ -17181,7 +18702,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -17196,17 +18717,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">Descripción de Posted</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Cargando</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">Nuevo Posted</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">Nunca</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17219,18 +18747,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Lugar</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Comentarios</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
@@ -17241,12 +18773,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Comentario</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished">Comentarios</translation>
     </message>
@@ -17256,7 +18788,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;El autor de este mensaje (con Identificación %1) está excluído.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17266,17 +18798,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Votar positivo</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Votar negativo</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Ajustar como leer y eliminar elemento</translation>
     </message>
@@ -17286,7 +18822,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nuevo</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Nuevo comentario:</translation>
     </message>
@@ -17296,7 +18832,7 @@ p, li { white-space: pre-wrap; }
         <translation>Valor del comentario</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
@@ -17337,10 +18873,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Cargando</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Por</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulario</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Acalorado</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nuevo</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Más alto</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Hoy</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Ayer</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Esta semana</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Este mes</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Este año</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Publicar un nuevo envío</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Siguiente</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Por favor, cree o seleccione una Id de firma antes de votar</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Anterior</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17360,17 +18963,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17380,15 +18973,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Administrador:</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">desconocido</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished">Distribución:</translation>
     </message>
@@ -17398,42 +18991,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">Posts</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17453,7 +19046,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Acalorado</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Buscar</translation>
     </message>
@@ -17483,17 +19076,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17508,17 +19101,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Vacío</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Copiar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17528,31 +19116,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Editar</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished">información</translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17567,7 +19151,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Suscribirse</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">Nunca</translation>
     </message>
@@ -17641,16 +19225,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Ningún canal seleccionado</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17659,6 +19233,14 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Abrir cada asunto en una nueva pestaña</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Enlaces</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17672,6 +19254,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Posted</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17740,17 +19326,25 @@ p, li { white-space: pre-wrap; }
         <translation>Administrador de perfiles</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&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;
+&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;Ubuntu&apos;; font-size:11pt; 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;Seleccione una clave de nodo RetroShare de la lista de debajo para ser usada en otra computadora, y pulse &amp;quot;Exportar clave seleccionada.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Para crear una nueva ubicación en un equipo distinto, seleccione el administrador de identidades en la ventana de inicio de sesión. Desde allí puede importar el fichero de clave y crear una nueva ubicación para esa clave. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Crear un nuevo nodo con la misma clave permite que sus nodos amigos le acepten automáticamente.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -17861,7 +19455,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Editar mensaje de estado</translation>
@@ -17877,7 +19471,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>Administrador de perfiles</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Información pública</translation>
     </message>
@@ -17912,12 +19506,12 @@ y utilizar el botón Importar para cargarla</translation>
         <translation>En línea desde:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Otra información</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Mi dirección</translation>
     </message>
@@ -17961,27 +19555,51 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Entrada de:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Cuenta 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Cuenta 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Cuenta 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Añadir a Pulse</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">filtro</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">URL añadida</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Mostrar como</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17991,12 +19609,12 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished">De:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18026,13 +19644,13 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished">Negativo</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18044,22 +19662,12 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18068,13 +19676,17 @@ y utilizar el botón Importar para cargarla</translation>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Mensaje de Pulso para Wire</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18089,24 +19701,34 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Cargar archivo de imagen</translation>
+        <source>From</source>
+        <translation type="vanished">De</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Fecha</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18117,7 +19739,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished">Formulario</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18136,7 +19758,7 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18146,7 +19768,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18173,7 +19795,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18183,7 +19805,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18203,7 +19825,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18319,7 +19941,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18327,42 +19949,37 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18394,7 +20011,7 @@ y utilizar el botón Importar para cargarla</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18402,8 +20019,8 @@ y utilizar el botón Importar para cargarla</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Confirmación</translation>
     </message>
@@ -18673,12 +20290,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Detalles del vecino</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Solicitud del archivo cancelada</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Esta versión de RetroShare está usando OpenPGP SDK. Como efecto secundario, no está utilizando el juego de claves PGP compartido por el sistema, pero tiene su propio juego de claves compartido por todas las instancias de RetroShare. &lt;br&gt;&lt;br&gt;No parece que tenga tal juego de claves, aunque las claves PGP son mencionadas por cuentas existentes de RetroShare, probablemente debido a que acaba de cambiar a esta nueva versión del programa.</translation>
     </message>
@@ -18709,7 +20326,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Ocurrió un error inesperado. Error: &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation>¡No se puede iniciar el Administrador de Tor!</translation>
     </message>
@@ -18747,7 +20364,7 @@ El error obtenido es:&quot;</translation>
         <translation>No fue posible iniciar un servicio oculto.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Instancias múltiples</translation>
@@ -18770,26 +20387,6 @@ archivo bloqueado:
  Archivo bloqueado:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18810,6 +20407,14 @@ archivo bloqueado:
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
+        <translation type="vanished">El túnel está pendiente... Los mensajes se entregarán tan pronto como sea posible</translation>
+    </message>
+    <message>
+        <source>Secured tunnel is working. Messages are delivered immediately!</source>
+        <translation type="vanished">El túnel asegurado está funcionando. ¡Los mensajes se entregarán inmediatamente!</translation>
+    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -18872,7 +20477,7 @@ El error reportado es:
         <translation>Datos reenviados</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Parece que tiene nodos asociados a claves DSA:</translation>
     </message>
@@ -18882,7 +20487,7 @@ El error reportado es:
         <translation>Las claves DSA aún no están soportadas por esta versión de RetroShare. Todos estos nodos serán inutilizables. Lo sentimos por esto.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>habilitado</translation>
     </message>
@@ -18892,7 +20497,7 @@ El error reportado es:
         <translation>deshabilitado</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Mover IP %1 a la lista blanca</translation>
     </message>
@@ -18908,7 +20513,7 @@ El error reportado es:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>hace %1 segundos</translation>
     </message>
@@ -18976,7 +20581,7 @@ Security: no anonymous IDs</source>
 Seguridad: No hay identificaciones anónimas</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation>Unirse a la sala de chat</translation>
     </message>
@@ -19004,7 +20609,7 @@ Seguridad: No hay identificaciones anónimas</translation>
         <translation>¡no se pudo interpretar el fichero XML!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation>Indefinidamente</translation>
     </message>
@@ -19184,29 +20789,13 @@ Seguridad: No hay identificaciones anónimas</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Nombre</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Nodo</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished">Dirección</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Estado</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19399,6 +20988,10 @@ Seguridad: No hay identificaciones anónimas</translation>
         <source>Click to resume the hashing process</source>
         <translation>Haz clic para continuar con el proceso de hashing</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Este certificado contiene:</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19449,18 +21042,6 @@ Seguridad: No hay identificaciones anónimas</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19618,7 +21199,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>En toda la red</translation>
     </message>
@@ -19801,7 +21382,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>La carga de las imágenes incrustadas esta bloqueada.</translation>
     </message>
@@ -19814,7 +21395,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Permitido por defecto</translation>
     </message>
@@ -19987,22 +21568,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">Guardar imagen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20010,12 +21581,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation>Opciones de vista de árbol</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20045,6 +21616,14 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">Mostrar columna...</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[sin título]</translation>
+    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -20705,7 +22284,7 @@ Si crees que es correcto, elimina la correspondiente línea del archivo y reábr
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nombre</translation>
@@ -20826,7 +22405,7 @@ Si crees que es correcto, elimina la correspondiente línea del archivo y reábr
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Nombre</translation>
     </message>
@@ -20846,7 +22425,7 @@ Si crees que es correcto, elimina la correspondiente línea del archivo y reábr
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20906,7 +22485,7 @@ reenviado a sus amigos.</translation>
         <translation type="unfinished">El mensaje será reenviado a sus amigos.</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Mensaje redactado ... ]</translation>
     </message>
@@ -20920,6 +22499,11 @@ reenviado a sus amigos.</translation>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Mensaje perdido ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20933,11 +22517,6 @@ reenviado a sus amigos.</translation>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished">A</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20960,18 +22539,13 @@ reenviado a sus amigos.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Pulsar para ordenar por leido</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Pulsar para ordenar por remitente</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20994,9 +22568,7 @@ reenviado a sus amigos.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21017,7 +22589,7 @@ reenviado a sus amigos.</translation>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Reiniciar todos los ajustes de RetroShare.</translation>
     </message>
@@ -21078,7 +22650,7 @@ reenviado a sus amigos.</translation>
         <translation>Determinar el idioma de retroShare. </translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>No se puede abrir el archivo de registro &apos;%1&apos;: %2</translation>
     </message>
@@ -21099,7 +22671,11 @@ reenviado a sus amigos.</translation>
         <translation>No se pudo crear el directorio de datos: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Revisión</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation>modoop</translation>
     </message>
@@ -21129,7 +22705,7 @@ reenviado a sus amigos.</translation>
         <translation>Información sobre el uso de la GUI</translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>Código de idioma especificado no válido:</translation>
     </message>
@@ -21147,7 +22723,7 @@ reenviado a sus amigos.</translation>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Error de acceso al registro. Puede que necesite privilegios de Administrador.</translation>
@@ -21164,12 +22740,12 @@ reenviado a sus amigos.</translation>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Introduzca una palabra clave aquí (como mínimo 3 letras)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Comenzar búsqueda</translation>
     </message>
@@ -21231,7 +22807,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Limpiar</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Palabras clave</translation>
     </message>
@@ -21246,7 +22822,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>ID de la búsqueda</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Nombre de archivo</translation>
     </message>
@@ -21346,23 +22922,23 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Descargar seleccionados</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Nombre de archivo</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Copiar enlace de RetroShare</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Enviar enlace de RetroShare</translation>
     </message>
@@ -21372,7 +22948,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Notificación de descarga</translation>
     </message>
@@ -21409,7 +22985,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Borrar todo</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Carpeta</translation>
@@ -21420,17 +22996,17 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nuevo(s) enlace(s) de RetroShare</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Abrir carpeta</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Crear colección...</translation>
     </message>
@@ -21450,7 +23026,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Descargar desde archivo de colección...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Colección</translation>
     </message>
@@ -21458,7 +23034,7 @@ en la red (siempre informar de archivos disponibles)</translation>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Detalles del vecino</translation>
     </message>
@@ -21474,22 +23050,22 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Eliminar objeto</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>Dirección IP:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Identificación del vecino:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Nombre del vecino:</translation>
     </message>
@@ -21506,7 +23082,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Ocultar</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation>pero se informó de:</translation>
     </message>
@@ -21531,8 +23107,8 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>&lt;p&gt;Esta es la IP a la que su amigo afirma estar conectado. Si acaba de cambiar las IPs, esta es una advertencia en falso. Si no, eso significa que su conexión con este amigo está siendo repetida por un vecino intermedio, que sería sospechoso.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esta advertencia está aquí para protegerle contra ataques de interposición y reenvío de tráfico. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Sin embargo, si sencillamente su IP cambia por alguna razón (algunos ISPs fuerzan cambios de IPs regularmente) esta advertencia sólo le dice que un amigo conectó a la nueva IP antes de que RetroShare notara el cambio de IP. No hay nada incorrecto en este caso.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Puede suprimir fácilmente falsas advertencias añadiendo sus propias IPs a la lista-blanca (ej. el rango de su ISP), o deshabilitando completamente estas advertencias en Opciones-&amp;gt;Notificar-&amp;gt;Novedades (feed).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -21540,7 +23116,7 @@ en la red (siempre informar de archivos disponibles)</translation>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>quiere ser su amigo en RetroShare</translation>
     </message>
@@ -21571,7 +23147,7 @@ en la red (siempre informar de archivos disponibles)</translation>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Expandir</translation>
     </message>
@@ -21616,12 +23192,12 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Estado:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Escribir mensaje</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Intentando conectar</translation>
     </message>
@@ -21641,22 +23217,17 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Desconocido (saliente) intento de conexión</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Problema de seguridad desconocido</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21666,7 +23237,11 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Vecino desconocido</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
@@ -21676,7 +23251,7 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>¿Quiere eliminar este amigo?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>¡¡El certificado tiene una firma errónea!! El vecino no es quien dice ser.</translation>
     </message>
@@ -21686,12 +23261,12 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Certificado perdido/dañado. No es un usuario RetroShare real.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>El certificado provocó un error interno.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>El vecino/nodo no está en la lista de amigos (identificación PGP=</translation>
     </message>
@@ -21750,12 +23325,12 @@ en la red (siempre informar de archivos disponibles)</translation>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Dirección local</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -21776,22 +23351,22 @@ en la red (siempre informar de archivos disponibles)</translation>
         <translation>Puerto:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Red local</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Buscador de direcciónes IP externas</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>IPs conocidas / anteriores:</translation>
     </message>
@@ -21807,16 +23382,21 @@ behind a firewall or a VPN.</source>
  tras de un cortafuegos o una VPN.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Permitir a RetroShare preguntarle mi ip a estos sitios web:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Rango de puertos aceptable desde 10 a 65535. Normalmente los puertos por debajo del 1024 están reservados por su sistema.</translation>
     </message>
@@ -21826,46 +23406,23 @@ behind a firewall or a VPN.</source>
         <translation>Rango de puertos aceptable desde 10 a 65535. Normalmente los puertos por debajo del 1024 están reservados para su sistema.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Dirección onion</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Descubrimiento activado (recomendado)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>Tor ha sido configurado automáticamente por Retroshare. No deberías necesitar cambiar nada aquí.</translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Descubrimiento inactivo</translation>
     </message>
@@ -21875,7 +23432,7 @@ List of found external IP:
         <translation>Oculto - Ver configuración</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>Dirección I2P</translation>
     </message>
@@ -21900,95 +23457,41 @@ List of found external IP:
         <translation>entrada correcta</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>El proxy parece funcionar.</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>El proxy I2P no está habilitado</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
+        <translation>BOB está funcionando y accesible</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
-        <translation type="unfinished"></translation>
+        <source>BOB is not accessible! Is it running?</source>
+        <translation>BOB no es accesible! Está funcionando?</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Retroshare utiliza BOB para crear un %1 túnel en %2:%3 (llamado %4)
+
+Al cambiar opciones (p.e. el puerto) utiliza los botones de abajo para reiniciar BOB.
+
+</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation>cliente</translation>
     </message>
@@ -22003,7 +23506,73 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>desconocido</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation>BOB está procesando una petición</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation>comprobación de conectividad</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation>creando clave</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation>iniciando</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation>apagando</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation>BOB está procesando una petición: %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation>BOB está roto
+</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation>BOB ha encontrado un error:
+</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation>El túnel de BOB está funcionando</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation>BOB está funcionando bien: túnel establecido</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation>El túnel de BOB no está funcionando</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation>BOB está inactivo: túnel cerrado</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation>solicita una nueva clave de servidor</translation>
     </message>
@@ -22013,7 +23582,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>carga la clave de servidor desde base64</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation>para generar una nueva clave, primero detén el túnel BOB</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation>para cargar una clave, primero detén el túnel BOB</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation>detén el túnel BOB para desactivar BOB</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Usted no es alcanzable mediante el servicio oculto.</translation>
     </message>
@@ -22027,12 +23611,12 @@ Also check your ports!</source>
 ¡Compruebe también sus puertos!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Modo oculto]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esto limpia la lista de direcciones conocidas. Esta acción es útil si por algún motivo su lista de direcciones contiene una dirección no-válida/irrelevante/caducada que quiera evitar pasar a sus amigos como dirección de contacto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22042,7 +23626,7 @@ Also check your ports!</source>
         <translation>Limpiar</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>Límite de descarga (KB/s)</translation>
     </message>
@@ -22057,24 +23641,24 @@ Also check your ports!</source>
         <translation>Límite de subida (KB/s)</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El límite de subida cubre el total de la aplicación. Un límite de subida demasiado pequeño eventualmente podría bloquear servicios de prioridad baja (canales de foros). Un valor mínimo recomendado es 50 KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation>ATENCIÓN:
 Estos valores no tienen en cuenta los Relays.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22091,7 +23675,17 @@ Ahora, añade la dirección (p.e. 127.0.0.1) y el puerto que has elegido para el
 Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar. ¿Por qué no utilizar Tor y/o I2P?</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation>I2P/BOB automático</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation>Activar I2P BOB - este cambio requiere reiniciar para que tenga el efecto esperado</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation>activa la configuración avanzada</translation>
     </message>
@@ -22101,7 +23695,12 @@ Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar
         <translation>modo avanzado</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation>I2P Basic Open Bridge</translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation>Dirección de instancia de I2P</translation>
     </message>
@@ -22111,7 +23710,17 @@ Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation>Puerto del proxy I2P</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation>BOB accesible</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
@@ -22151,7 +23760,7 @@ Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar
         <translation>cargar clave</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
@@ -22166,7 +23775,12 @@ Puedes conectar con nodos ocultos incluso si estás utilizando un nodo estándar
         <translation>Detener</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation>Estado de BOB</translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation>Entrante</translation>
     </message>
@@ -22213,32 +23827,7 @@ Para terminar, asegúrate de que los puertos coinciden con la configuración.
 Si tienes problemas conectando a través de Tor, comprueba sus logs.</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation>Repetidor</translation>
     </message>
@@ -22293,7 +23882,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Total:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation>Atención: este ancho de banda supera el máximo ancho de banda.</translation>
     </message>
@@ -22318,7 +23907,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Quitar servidor</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22332,7 +23921,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>Filtros de IP</translation>
     </message>
@@ -22355,7 +23944,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
@@ -22415,28 +24004,17 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Añadir a la lista blanca</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Configuración de servicio oculto</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este es el puerto proxy Socks de Tor. Su nodo RetroShare puede usar este puerto para conectar a&lt;/p&gt;&lt;p&gt;nodos ocultos. El led de la derecha se vuelve verde cuando este puerto esté activo en su computadora. &lt;/p&gt;&lt;p&gt;Sin embargo esto no significa que su tráfico de RetroShare transite a través de Tor. Sólo lo hace si &lt;/p&gt;&lt;p&gt;conecta a nodos ocultos, o si usted mismo está ejecutando un nodo oculto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este led a la izquierda será verde cuando el puerto de escucha esté activo en su computadora. No&lt;/p&gt;&lt;p&gt;significa que su tráfico de RetroShare transite a través de Tor. Sólo lo hará si&lt;/p&gt;&lt;p&gt;conecta a nodos ocultos, o si usted mismo está ejecutando un nodo oculto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22452,18 +24030,18 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este led a la izquierda será verde cuando el puerto de escucha esté activo en su computadora. No&lt;/p&gt;&lt;p&gt;significa que su tráfico de RetroShare transite a través de I2P. Sólo lo hará si&lt;/p&gt;&lt;p&gt;conecta a nodos ocultos, o si usted mismo está ejecutando un nodo oculto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>Salida de I2P correcta</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Dirección del servicio</translation>
     </message>
@@ -22498,12 +24076,12 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Por favor, introduzca una dirección de servicio</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>Rango de IPs</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Fue señalado por la DHT (tabla distribuida de hashes) para enmascaramiento de IP (IP masquerading)</translation>
     </message>
@@ -22526,22 +24104,22 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Añadido por usted</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Las IPs en lista blanca son reunidas desde las siguientes fuentes: IPs provenientes del interior de certificados intercambiados manualmente, rangos de IPs introducidos por usted en esta ventana, o en los elementos de seguridad de las novedades (feed).&lt;/p&gt;&lt;p&gt;El comportamiento predeterminado para RetroShare es (1) permitir siempre la conexión a los vecinos con IP en la lista blanca; (2) requerir opcionalmente que las IPs estén en la lista blanca. Puede cambiar este comportamiento en la ventana &amp;quot;Detalles&amp;quot; de cada nodo RetroShare. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La DHT (tabla dinámica de hashes) le permite responder a las peticiones de conexión de sus amigos usando la DHT de BitTorrent. Esto mejora enormemente la conectividad. No se almacena en realidad información en la DHT, sólo se usa como un proxy (interpuesto) del sistema para ponerse en contacto con otros nodos RetroShare.&lt;/p&gt;&lt;p&gt;El servicio de Descubrimiento envía el nombre del nodo y las identificaciones de sus contactos de confianza a vecinos conectados, para ayudarles a elegir nuevos amigos. Sin embargo, el establecimiento de amistad nunca es automático, y ambos vecinos todavía necesitan confiar el uno en el otro para permitir la conexión. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El indicador se vuelve verde tan pronto como RetroShare logra obtener su propia IP de los sitios web listados debajo, si habilita esa acción. RetroShare también usará otros medios para averiguar su propia IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Esta lista se rellena automáticamente con información reunida en múltiples fuentes: vecinos con enmascaramiento de los que informó la DHT, rangos de IPs introducidos por usted, y rangos de IPs de los que informaron sus amigos. La configuración predeterminada debe protegerle contra la repetición de tráfico a gran escala.&lt;/p&gt;&lt;p&gt;Conjeturar automáticamente si las IPs son de enmascaramiento puede incluir las IPs de sus amigos en la lista negra. En ese caso, use el menú contextual para incluirlas en la lista blanca.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22576,22 +24154,26 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Excluir automáticamente rangos de IPs de enmascaramiento de la DHT comenzando en</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation>Tor/I2P saliente manual</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configura tus SOCKS proxy Tor e I2P aquí. &lt;br/&gt;Si prefieres utilizar BOB para gestionar automáticamente I2P, visita la otra pestaña.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Proxy Socks de Tor</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Salida de Tor correcta</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>El proxy de Tor no está habilitado</translation>
     </message>
@@ -22671,7 +24253,7 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>seleccione los vecinos con los que desea compartir su clave privada de publicación</translation>
     </message>
@@ -22681,12 +24263,12 @@ Si tienes problemas conectando a través de Tor, comprueba sus logs.</translatio
         <translation>Compartir con amigo</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Compartir</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Puede permitir a sus amigos saber de su canal al compartirlo con ellos. 
@@ -22706,7 +24288,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Administrador de carpetas compartidas</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation>Directorio compartido</translation>
     </message>
@@ -22726,17 +24308,17 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Visibilidad</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation>Añadir nuevo</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Compartir una carpeta</translation>
     </message>
@@ -22746,7 +24328,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Quitar</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Aplicar y cerrar</translation>
     </message>
@@ -22837,7 +24419,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Carpeta no encontrada o nombre de carpeta no aceptado.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Esta es una lista de carpetas compartidas. Puedes añadir o quitar carpetas utilizando los botones inferiores. Cuando añades una carpeta inicialmente se comparte todo su contenido. Puedes cambiar los permisos individualmente para cada carpeta.</translation>
     </message>
@@ -22845,7 +24427,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Archivos</translation>
     </message>
@@ -22896,16 +24478,11 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>Comprobar archivos</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Descargar seleccionados</translation>
     </message>
@@ -22915,7 +24492,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Descargar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Copiar enlace de RetroShare al portapapeles</translation>
     </message>
@@ -22930,7 +24507,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Enviar enlaces de RetroShare</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation>Algunos ficheros se han omitido</translation>
     </message>
@@ -22946,7 +24523,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Recomendaciones</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Crear colección...</translation>
     </message>
@@ -22971,7 +24548,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Descargar desde archivo de colección...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Algunos ficheros se han omitido porque aún no han sido indexados.</translation>
     </message>
@@ -23114,12 +24691,12 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Cargar configuración</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Crear interfaz</translation>
     </message>
@@ -23143,7 +24720,7 @@ Seleccione los amigos con los que quiere compartir su canal.</translation>
         <translation>Recordar contraseña</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Iniciar sesión</translation>
     </message>
@@ -23500,7 +25077,7 @@ Esta elección puede revertirse en la configuración.</translation>
         <translation>Mensaje de estado</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Mensage:</translation>
     </message>
@@ -23745,7 +25322,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Quitar todas las etiquetas</translation>
     </message>
@@ -23781,15 +25358,12 @@ p, li { white-space: pre-wrap; }
         <translation>Configurando Tor...</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation>Estado Tor:</translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -23799,13 +25373,18 @@ p, li { white-space: pre-wrap; }
         <translation>No iniciado</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
+        <translation>Dirección del servicio oculto:</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation>Estado de la secuencia Tor:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation>No establecido</translation>
     </message>
@@ -23815,57 +25394,12 @@ p, li { white-space: pre-wrap; }
         <translation>Dirección onion:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">No conectado</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation>Comprueba que Tor es accesible en tu ruta de ejecución</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation>[Esperando a Tor...]</translation>
     </message>
@@ -23873,17 +25407,21 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Esta versión de RetroShare utiliza Tor para conectar con tus amigos.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation>Tor está actualmente fuera de línea</translation>
     </message>
@@ -23894,12 +25432,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Sin configuración de Tor</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23927,7 +25464,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Opciones de transferencias</translation>
@@ -23938,7 +25475,7 @@ p, li { white-space: pre-wrap; }
         <translation>Máximas descargas simultáneas:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation>Directorios compartidos</translation>
     </message>
@@ -23948,27 +25485,22 @@ p, li { white-space: pre-wrap; }
         <translation>Compartir automáticamente el directorio de entrada (recomendado)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation>Editar compartidos</translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished">Configurar directorios compartidos</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation>Comprobar automáticamente los directorios compartidos cada</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation>minuto(s)</translation>
     </message>
@@ -24053,7 +25585,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24062,12 +25594,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Máximo de subidas por amigo (0 = sin límite) </translation>
     </message>
@@ -24092,12 +25619,7 @@ p, li { white-space: pre-wrap; }
         <translation>Permitir descarga directa:</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -24156,13 +25678,38 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; es capaz de transferir datos y peticiones de búsqueda entre vecinos que no necesariamente son amigos. Sin embargo, este tráfico sólo transita a través de una lista de amigos conectados, y es anónimo.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;Puede establecer indicativos para cada directorio compartido por separado en el cuadro de diálogo de ficheros compartidos para que sean:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Explorables por amigos&lt;/span&gt;: Los ficheros son vistos por sus amigos.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Compartidos anónimamente&lt;/span&gt;: Los ficheros son alcanzables anónimamente a través de túneles anónimos F2F (entre amigos).&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Máximo de peticiones de túnel repetidas por segundo:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;provoca que la transferencia requiera 1 MB de pedazos del archivo en orden desde el principio, para facilitar la previsualización durante la descarga. &lt;span style=&quot; font-weight:600;&quot;&gt;Aleatoria&lt;/span&gt; es puramente aleatoria y favorece un comportamiento de enjambre (subir y bajar el archivo simultáneamente). &lt;span style=&quot; font-weight:600;&quot;&gt;Progresiva&lt;/span&gt; es un equilibrio, selecciona el siguiente pedazo aleatoriamente dentro de los 50 MB posteriores al final de un archivo parcial. Eso permite cierta aleatorización a la vez que previene grandes tiempos de inicialización de archivos vacíos.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RetroShare suspenderá todas las transferencias y configurará el guardado de archivos si el espacio de disco baja de este límite. Esto previene la pérdida de información en algunos sistemas. Una ventana emergente le alertará cuando eso suceda.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24172,17 +25719,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Este valor controla cuantas peticiones de túneles puede repetir por segundo su vecino. &lt;/p&gt;&lt;p&gt;Si tiene un gran ancho de banda para Internet, puede elevar esto hasta 30-40, para estadísticamente permitir pasar a túneles más largos. No obstante tenga mucho cuidado, ya que esto genera muchos paquetes pequeños que pueden ralentizar significativamente su propia transferencia de archivos. &lt;/p&gt;&lt;p&gt;El valor por defecto es 20. Si no está seguro, déjelo así.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Aviso</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation>Establecer directorio de entrada</translation>
     </message>
@@ -24210,7 +25747,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Descarga completa</translation>
     </message>
@@ -24234,23 +25771,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Tiene %1 descargas completas</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Tiene %1 descarga completa</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 descargas completas</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 descarga completa</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Descargas</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Enviando</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nombre</translation>
@@ -24457,7 +26010,11 @@ p, li { white-space: pre-wrap; }
         <translation>Especificar...</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Transferencia de archivos&lt;/h1&gt;                                                             &lt;p&gt;RetroShare tiene dos formas de transferir archivos: transferencias directas desde sus amigos, y                                         transferencias distantes anónimas por túnel. Además, la transferencia de archivos es desde múltiples-fuentes y permite comportamiento de enjambre                                          (puede ser fuente a la vez que descarga)&lt;/p&gt;                                         &lt;p&gt;Puede compartir archivos usando el &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icono del lado izquierdo de la barra lateral.     Estos archivos se listarán en la pestaña Mis Archivos. Puede decidir para cada grupo de amigos si pueden o no ver estos archivos en su pestaña de Archivos de Amigos&lt;/p&gt;    &lt;p&gt;La pestaña de búsqueda informa de archivos de las listas de archivos de sus amigos, y de archivos distantes que se pueden alcanzar     de forma anónima usando la sistema de tunelización de múltiples-saltos.&lt;/p&gt;     </translation>
+    </message>
+    <message>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Mover en la lista de espera...</translation>
     </message>
@@ -24482,7 +26039,7 @@ p, li { white-space: pre-wrap; }
         <translation>Elegir directorio</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Túnel anónimo cifrado extremo-a-extremo 0x</translation>
     </message>
@@ -24503,7 +26060,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24536,17 +26093,7 @@ p, li { white-space: pre-wrap; }
         <translation>El archivo %1 no está completo todavía. Si es un archivo multimedia, trate de obtener una vista previa.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Aviso</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Cambiar nombre de archivo</translation>
     </message>
@@ -24561,7 +26108,7 @@ p, li { white-space: pre-wrap; }
         <translation>Por favor, introduzca un nuevo - y válido - nombre de archivo</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Expandir todo</translation>
@@ -24688,18 +26235,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation> Columnas</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Transferencia de archivos</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
@@ -24709,7 +26261,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mostrar columna de ruta</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>No se pudo borrar el archivo de vista previa</translation>
     </message>
@@ -24719,7 +26271,7 @@ p, li { white-space: pre-wrap; }
         <translation>¿Intentarlo de nuevo?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Crear colección...</translation>
     </message>
@@ -24734,12 +26286,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ver colección...</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+193"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Colección</translation>
     </message>
@@ -24749,7 +26296,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 túneles</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Túnel anónimo 0x</translation>
     </message>
@@ -24970,6 +26517,10 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">Túneles anónimos</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25163,17 +26714,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulario</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Habilitar interfaz WEB de RetroShare</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Estado:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Parámetros web</translation>
     </message>
@@ -25207,33 +26753,35 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port:</source>
+        <translation type="vanished">Puerto:</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation>Permitir el acceso desde todas las direcciones IP (Predeterminado: sólo localhost (nodo local))</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <source>Apply setting and start browser</source>
+        <translation type="vanished">Aplicar configuración e iniciar navegador</translation>
+    </message>
+    <message>
+        <source>Note: these settings do not affect retroshare-nogui. Retroshare-nogui has a command line switch to activate the web interface.</source>
+        <translation type="vanished">Nota: estas configuraciones no afectan a retroshare-nogui (aplicación en línea de comandos sin interfaz gráfica). retroshare-nogui tiene un parámetro de línea comandos para activar la interfaz web. </translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Interfaz web&lt;/h1&gt;       &lt;p&gt;La interfaz web le permite controlar Retroshare desde el navegador. Múltiples dispositivos pueden compatir el control sobre una instancia Retroshare. Así que podría iniciar una conversación en una tableta y posteriormente usar una computadora de escritorio para continuarla.&lt;/p&gt;     &lt;p&gt;Advertencia: No exponga la interfaz web hacia Internet, porque no hay control de acceso ni cifrado. Si quiere usar la interfaz web sobre Internet, use un túnel SSH o un proxy para asegurar la conexión.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>Interfaz web no habilitada</translation>
     </message>
@@ -25243,12 +26791,12 @@ p, li { white-space: pre-wrap; }
         <translation>La interfaz web no está habilitada. Habilítela en Configuración -&gt; Interfaz web</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>fallo al iniciar la interfaz web</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Interfaz web</translation>
     </message>
@@ -25385,7 +26933,11 @@ p, li { white-space: pre-wrap; }
         <translation>Páginas Wiki</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Nuevo grupo</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Nombre página</translation>
     </message>
@@ -25400,7 +26952,7 @@ p, li { white-space: pre-wrap; }
         <translation>ID original</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25488,7 +27040,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Historial de edición de páginas</translation>
     </message>
@@ -25523,7 +27075,7 @@ p, li { white-space: pre-wrap; }
         <translation>ID de página</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25553,18 +27105,14 @@ p, li { white-space: pre-wrap; }
         <translation>Etiquetas</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Historial</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Mostrar historial de ediciones</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
@@ -25585,7 +27133,7 @@ p, li { white-space: pre-wrap; }
         <translation>Revertir</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Enviar</translation>
     </message>
@@ -25657,6 +27205,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">Intervalo de tiempo</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25668,7 +27220,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Refrescar</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25683,7 +27244,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Otros</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25703,7 +27264,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25733,17 +27294,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Mes pasado</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Semana pasada</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Hoy</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nuevo</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">de</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">hasta</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Buscar/Filtrar</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">En toda la red</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Administrar cuentas</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Mostrando:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Yo mismo</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Amigos</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Personalizar</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Cuenta 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Cuenta 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Cuenta 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">Casilla de verificación</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Mensaje de Pulso para Wire</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25806,42 +27435,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulario</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Lugar:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25886,41 +27508,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Siguiente</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Desconocido</translation>
@@ -25998,7 +27590,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1a. %2d</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26031,11 +27623,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Imágenes (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation>¿Acepta las conexiones firmadas por este perfil?</translation>
     </message>
@@ -26044,6 +27640,10 @@ p, li { white-space: pre-wrap; }
         <source>Name of the profile</source>
         <translation>Nombre del perfil</translation>
     </message>
+    <message>
+        <source>This column indicates trust level and whether you signed the profile PGP key</source>
+        <translation type="vanished">Esta columna indica el nivel de confianza y si ha firmado la clave PGP del perfil</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
@@ -26154,6 +27754,10 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> - </source>
+        <translation type="vanished">-</translation>
+    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_fi.ts b/retroshare-gui/src/lang/retroshare_fi.ts
index 2a52e18a6..4356c9860 100644
--- a/retroshare-gui/src/lang/retroshare_fi.ts
+++ b/retroshare-gui/src/lang/retroshare_fi.ts
@@ -84,6 +84,13 @@
         <translation>Ainoastaan piilotettu solmu</translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Lisää kommentti</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -121,12 +128,12 @@
         <translation>Retroshare: tarkennettu haku</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Hakuehdot</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Lisää hakuehto.</translation>
     </message>
@@ -136,7 +143,7 @@
         <translation>Tyhjennä hakuehdot.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Peruu haun.</translation>
     </message>
@@ -156,6 +163,177 @@
         <translation>Haku</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Luo albumi</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Albumin nimi:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Luokka:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Eläimet</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Sukulaiset</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Ystävät</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Kukat</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Loma</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Maisemat</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Lemmikit</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Muotokuvat</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Matkustaminen</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Työ</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Satunnainen</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Kuvateksti:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Missä:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Valokuvaaja:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Kuvaus:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Jakoasetukset</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Käytänne:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Laatu:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Kommentit:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Henkilöllisyys:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Julkinen</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Rajoitettu</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Muuta kuvien kokoa (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Muuta kuvien kokoa (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Lähetä alkuperäiset kuvat</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Kommentteja ei sallittu</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Varmennetut kommentit</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Kaikki kommentit sallittu</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Julkaise henkilöllisyyden kera</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Vedä ja pudota lisätäksesi kuvia. Paina kuvaa muokataksesi tietoja alhaalla.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Takaisin</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Lisää kuvia</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Julkaise albumi</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Nimetön albumi</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Kirjoita tietoja albumista</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Missä nämä on otettu?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Lataa albumin näytekuva</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -164,11 +342,19 @@
         <source>Album</source>
         <translation>Albumi</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Albumin näytekuva</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Yhteenveto</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -184,6 +370,34 @@
         <source>Caption</source>
         <translation>Kuvateksti</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Missä:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Milloin</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Kuvaus:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Jakoasetukset</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Kommentit</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Julkaise henkilöllisyys</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Näkyvyys</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -552,7 +766,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation> Varoitus: nämä palvelut ovat kokeellisia. Auta meitä niiden testaamisessa. 
@@ -568,6 +782,14 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>Piirit</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">Gxs-foorumit</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">GxsKanavat</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -579,23 +801,10 @@ p, li { white-space: pre-wrap; }
         <translation>Valokuvat</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">Tallenna kuva</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -632,13 +841,17 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Lisää avatar</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Aseta avatarkuvasi</translation>
     </message>
@@ -657,6 +870,10 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Lataa avatar</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -725,10 +942,22 @@ p, li { white-space: pre-wrap; }
         <translation>Palauta asetukset</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Vastaanottonopeus</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Lähetysnopeus</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Aina päällimmäisenä</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Tyyli</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -744,11 +973,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% näkyvä</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Tallenna</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Peru</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Alkaen:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Piilota asetukset</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -821,7 +1062,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentti</translation>
     </message>
@@ -851,12 +1092,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Tämän viestin kirjoittaja (tunnisteella %1) on pannassa.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -864,7 +1105,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Äänestä ylös</translation>
     </message>
@@ -884,7 +1125,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +1163,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Äänestä ylös</translation>
     </message>
@@ -942,7 +1183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -972,7 +1213,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Jaa</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Vaihda viestin tila luetuksi tai päinvastoin</translation>
     </message>
@@ -982,7 +1223,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Uusi</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -990,12 +1231,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Pidän tästä</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1015,18 +1256,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Laajenna</translation>
     </message>
@@ -1041,12 +1282,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Poista kohde</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1215,17 +1456,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Kanavat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Välilehdet</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Yleiset</translation>
     </message>
@@ -1235,17 +1476,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Lataukset</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Lataa viestit taustalla (aihe)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Avaa jokainen kanava uuteen välilehteen</translation>
     </message>
@@ -1253,7 +1488,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1276,7 +1511,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Pidän tästä</translation>
     </message>
@@ -1301,18 +1536,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Laajenna</translation>
     </message>
@@ -1327,7 +1562,7 @@ into the image, so as to
         <translation type="unfinished">Poista kohde</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
     </message>
@@ -1337,7 +1572,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentti</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished">Kommentit</translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Piilota</translation>
     </message>
@@ -1345,7 +1590,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
@@ -1536,7 +1781,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Näytä keskusteluhuone</translation>
     </message>
@@ -1548,6 +1793,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>Keskustelut</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Sinulle on uusia viestejä %1 kpl</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Sinulle on %1 uusi viesti</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 kpl uusia viestejä</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 uusi viesti</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1569,14 +1830,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Tuntematon huone</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Poista kaikki</translation>
     </message>
@@ -1584,13 +1844,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Lkm</translation>
     </message>
@@ -1600,7 +1860,33 @@ into the image, so as to
         <translation>Aihe</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>Yksityiset tilatut keskusteluhuoneet</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>Julkiset tilatut keskusteluhuoneet</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Yksityiset keskusteluhuoneet</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Julkiset keskusteluhuoneet</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Keskusteluhuoneet&lt;/h1&gt;&lt;p&gt;Keskusteluhuoneissa voit käydä nimettömiä keskusteluja lukuisien ihmisten kanssa ilman tarvetta ystävystyä.&lt;/p&gt;&lt;p&gt;Keskusteluhuone voi olla julkinen (ystäviesi nähtävissä) tai yksityinen (ystäväsi eivät näe sitä, ellet kutsu heitä painamalla &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). Kun sinut on kutsuttu yksityiseen huoneeseen, näet sen ystäviesi käyttäessä sitä&lt;/p&gt;&lt;p&gt;Vasemmalla oleva luettelo näyttää keskusteluhuoneet, joissa on ystäviäsi. Voit&lt;ul&gt; &lt;li&gt;Käyttää hiiren oikeata painiketta luodaksesi uuden huoneen&lt;/li&gt;&lt;li&gt;Kaksoisnapauttaa huonetta liittyäksesi keskusteluun&lt;/li&gt;&lt;/ul&gt;Huomaa, että tietokoneesi on oltava oikeassa ajassa, jotta keskusteluhuoneet toimivat kunnolla. Tarkista siis järjestelmäsi kello!&lt;/p&gt;                                      	                      </translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Luo keskusteluhuone</translation>
     </message>
@@ -1610,7 +1896,7 @@ into the image, so as to
         <translation>Poistu huoneesta</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Luo nimellä varustettu henkilöllisyys ja astu huoneeseen</translation>
     </message>
@@ -1669,12 +1955,12 @@ Valitse huoneita vasemmalta nähdäksesi tietoja.
 Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 kutsuu sinut keskusteluhuoneeseen nimeltä %2</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Valitse nimellä varustettu henkilöllisyys tätä keskusteluhuonetta varten:</translation>
     </message>
@@ -1684,31 +1970,31 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Valitse henkilöllisyys tätä keskusteluhuonetta varten:</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Luo keskusteluhuone</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Ei aihetta]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Tietoja valitusta huoneesta</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Yksityinen</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Julkinen</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>Nimettömät tunnisteet hyväksytty</translation>
     </message>
@@ -1718,25 +2004,42 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Poista automaattinen tilaus</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Lisää automaattinen tilaus</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Hae keskusteluauloista</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Hae nimeä</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Tilattu</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Sarakkeet</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Kyllä</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Ei</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1748,47 +2051,47 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Keskusteluhuoneen nimi:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>Keskusteluhuoneen tunniste:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Aihe:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Tyyppi:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Tietoturva:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Vertaiset:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
@@ -1803,24 +2106,13 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Ei nimettömiä tunnisteita</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation> sarake</translation>
@@ -1834,7 +2126,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Poista kohde</translation>
     </message>
@@ -1879,22 +2171,46 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Yleiset</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Etäinen keskustelu</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Jokainen</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Kontaktit</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Ei kukaan</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Hyväksy salattu etäinen keskustelu:</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Keskusteluasetukset</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Ota hymiöt käyttöön yksityiskeskustelussa</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Ota hymiöt käyttöön ryhmäkeskustelussa</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Käytä omia kirjasimia</translation>
     </message>
@@ -1903,6 +2219,10 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Enable custom font size</source>
         <translation>Käytä mukautettuja kirjasinkokoja</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Kirjasin vähimmäiskoko</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1914,7 +2234,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Käytä kursiivia</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1939,7 +2259,11 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Lataa upotetut kuvat</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Keskusteluhuone</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Vilkuta välilehtikuvaketta</translation>
     </message>
@@ -1948,6 +2272,10 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Do not send typing notifications</source>
         <translation>Älä lähetä kirjoittamista koskevia ilmoituksia</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Yksityinen keskustelu</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1969,7 +2297,11 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Vilkuta ikkuna- tai välilehtikuvaketta</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Keskustelun kirjasin</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Vaihda keskustelun kirjasin</translation>
     </message>
@@ -1979,10 +2311,14 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Keskustelun kirjasin:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Historia</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Tyyli</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1997,13 +2333,17 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Variant:</source>
         <translation>Muunnelma:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Ryhmäkeskustelu</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Yksityinen keskustelu</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation>Valitse oletuskirjasin keskustelulle.</translation>
     </message>
@@ -2067,28 +2407,22 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Tässä välilehdessä voit määrittää, kuinka monta chat-viestiä Retroshare pitää tallennettuna kiintolevylle ja kuinka paljon edellisestä keskustelusta näytetään eri keskustelutoiminnoissa. Säilytyksen enimmäisaika mahdollistaa vanhojen viestien hävittämisen ja estää keskusteluhistorian täyttymisen (esim. keskusteluaulat ja etäiset keskustelut).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Keskusteluaulat</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Käytössä:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">Haku</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2098,17 +2432,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Keskusteluhuoneet</translation>
@@ -2205,7 +2529,11 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Varastoinnin enimmäisaika, päivinä (0=pidä kaikki):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Haku oletuksena</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Huomioi kirjainkoko</translation>
     </message>
@@ -2244,6 +2572,10 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Threshold for automatic search</source>
         <translation>Automaattisen haun raja-arvo</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Oletushenkilöllisyys keskusteluauloihin:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2311,7 +2643,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Näytä keskustelu</translation>
     </message>
@@ -2347,7 +2679,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
@@ -2382,12 +2714,12 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation>Kursivointi</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>Syötä hymiö</translation>
     </message>
@@ -2467,6 +2799,11 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <source>Insert horizontal rule</source>
         <translation>Syötä vaakaviiva</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Tallenna kuva</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2504,7 +2841,7 @@ Kaksoisnapauta huonetta siirtyäksesi keskustelemaan.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>kirjoittaa...</translation>
     </message>
@@ -2528,7 +2865,7 @@ iso HTML-muuntamisen jälkeen.</translation>
         <translation>Valitse kirjasin.</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Haluatko todella tuhota historian pysyvästi?</translation>
     </message>
@@ -2578,7 +2915,7 @@ iso HTML-muuntamisen jälkeen.</translation>
         <translation>on kiireinen, eikä välttämättä vastaa</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Huomioi kirjainkoko</translation>
     </message>
@@ -2600,7 +2937,7 @@ iso HTML-muuntamisen jälkeen.</translation>
         <translation>Älä lopeta värittämistä, kun X kohdetta löydetty (vaatii konetehoa)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Hae edellinen &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2615,12 +2952,16 @@ iso HTML-muuntamisen jälkeen.</translation>
         <translation>&lt;b&gt;Hae &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Tila)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Aseta tekstin kirjasinlaji &amp; väri</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Liitä tiedosto</translation>
     </message>
@@ -2636,12 +2977,12 @@ iso HTML-muuntamisen jälkeen.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Merkitse tämä valittu teksti&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation>Henkilön tunniste:</translation>
     </message>
@@ -2653,12 +2994,12 @@ Double click on it to add his name on text writer.</source>
 Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation>Allekirjoittamaton</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>Kohteita löytyi.</translation>
     </message>
@@ -2678,7 +3019,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Kirjoita viesti tähän</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Älä lopeta värittämistä jälkeen</translation>
     </message>
@@ -2704,7 +3045,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Näytetään tietoja:</translation>
     </message>
@@ -2726,7 +3067,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Henkilökohtaiset piirit</translation>
     </message>
@@ -2752,7 +3093,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Ystävät</translation>
     </message>
@@ -2812,7 +3153,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Ystävien ystävät</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Ulkoiset piirit (Ylläpito)</translation>
     </message>
@@ -2828,7 +3169,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Piirit</translation>
     </message>
@@ -2880,48 +3221,43 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Virhe: vertaisen yksityiskohtia ei saatu.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2933,7 +3269,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Salaus</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>Ei yhteyttä</translation>
     </message>
@@ -3015,17 +3351,25 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>ei mitään</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Tämä varmenne sisältää:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt; &lt;b&gt;solmun tunniste&lt;/b&gt; ja &lt;b&gt;nimi&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">&lt;b&gt;onion-osoite&lt;/b&gt; ja &lt;b&gt;portti&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished"> &lt;b&gt;IP-osoite&lt;/b&gt; ja &lt;b&gt;ja&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Voit käyttää tätä varmennetta luodaksesi uusia ystäviä. Lähetä se sähköpostitse tai anna se tavatessanne.&lt;/p&gt;</translation>
     </message>
@@ -3040,7 +3384,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tätä salaus-metodia käyttää &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. Yhteys ystäväsolmuihin&lt;/p&gt;&lt;p&gt;on aina vahvasti salattu ja jos DHE on läsnä yhteys edelleen käyttää&lt;/p&gt;&lt;p&gt;&amp;quot;täydellistä forward secrecy-ominaisuutta&amp;quot; (salausavaimen murtaminen ei johda aiemmin salattujen viestien tietoturvan vaarantumiseen).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>kanssa</translation>
     </message>
@@ -3057,16 +3401,118 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <source>Connect Friend Wizard</source>
         <translation>Ohjattu toiminto ystävän yhdistämiseksi</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Lisää uusi ystävä</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Saat varmenteen ystävältäsi</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;Ystävysty valitsemieni ystävien ystävien kanssa</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Email 
+ (Your friend will receive an email with instructions how to download RetroShare)</source>
+        <translation type="vanished">&amp;Lähetä kutsu sähköpostilla 
+ (Ystäväsi saa sähköpostin, jossa on ohjeet Retrosharen lataamiseksi)</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Sisällytä allekirjoitukset</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Kopioi varmenteesi leikepöydälle</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Tallenna varmenteesi tiedostoon</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Käynnistä sähköpostiohjelma</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Avaa ystäväsi varmenne tiedostosta</translation>
     </message>
+    <message>
+        <source>Open certificate</source>
+        <translation type="vanished">Avaa varmenne</translation>
+    </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">Ole hyvä ja liitä ystäväsi Retroshare-varmenne allaolevaan laatikkoon</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Varmennetiedostot</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Käytä tiedostoihin tallennettuja PGP-varmenteita.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Tuo ystävän varmenne...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Sinun tulee luoda tiedosto, joka sisältää varmenteesi ja antaa se ystävällesi. Voit myös käyttää aiemmin luotua tiedostoa.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Vie varmenteeni...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Vedä ja pudota ystäväsi varmenne tähän ikkunaan tai määritä polku allaolevaan laatikkoon</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Selaa</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Ystävien ystäviä</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Valitse nyt, kenen kanssa haluat ystävystyä.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Näytä:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Ystävysty näiden vertaisten kanssa</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>Retrosharen tunniste</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Käytä Retroshare-tunnistetta verkossasi olevan ystävän lisäämiseen.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Lisää ystävän Retroshare-tunniste...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Liitä ystävän Retroshare-tunniste allaolevaan laatikkoon</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Anna ystäväsi Retroshare-tunniste, tyyliin Vertainen@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3108,7 +3554,27 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Sähköposti</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Kutsu ystäviä sähköpostilla</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Kirjoita ystäviesi sähköpostiosoitteet (erottele ne puolipisteellä)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Ystäviesi sähköpostiosoitteet:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Kirjoita ystäviesi sähköpostiosoitteet</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Aihe:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3124,32 +3590,78 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Tietoja pyynnöstä</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Vertaisen tiedot</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Sähköposti:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Solmu:</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">Huomioithan, että Retroshare edellyttää kohtuuttomia määriä tietoliikennekaistaa, muistia ja suoritintehoa, jos lisäät paljon ystäviä. Voit lisätä niin monta ystävää kuin haluat, mutta yli 40 luultavasti vaatii liikaa 
+resursseja.</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Sijainti:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">Tämä aputoiminta auttaa sinua ottamaan yhteyden ystäviisi Retroshare-verkossa.&lt;br&gt;Valitse miten haluaisit lisätä ystävän:</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Anna varmenne manuaalisesti</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">Anna Retroshare tunniste manuaalisesti</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">&amp;Lähetä kutsu webmailpalvelun kautta</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Suosittele useita ystäviä toisilleen</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">Retroshare varmenne</translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">Ole hyvä ja liitä alle ystäväsi Retroshare-varmenne</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Liitä varmenne</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä laatikko vaatii sinun ystäväsi Retroshare-varmenteen. VAROITUS: se on erilainen, kuin ystäväsi profiiliavain. Älä liitä ystäväsi profiiliavainta tähän (edes osaa siitä). Se ei tule toimimaan.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Lisää ystävä ryhmään:</translation>
     </message>
@@ -3159,7 +3671,7 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Varmenna ystävä (allekirjoita PGP-avain)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3184,22 +3696,16 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Lisää ystäväksi, johon otat yhteyden</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Paina Valmis-painiketta hyväksyäksesi ystäväpyynnön</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Valitettavasti on tapahtunut jokin virhe</translation>
     </message>
@@ -3219,27 +3725,32 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
         <translation>Tietoja ystävästäsi:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Avaimen kelpoisuus:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Allekirjoittajat</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Ystäväsi avaimen allekirjoittamisella ilmaiset luottamuksesi tähän ystävään muille ystävillesi. Allekirjoitukset alla kryptograafisesti todistavat, että luettelon avaimien omistajat tunnistavat nykyisen PGP-avaimen aidoksi.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Tämä vertainen on jo ystäväluettelossasi. Hänen lisäämisensä saattaa ainoastaan määrittää uuden IP-osoitteen.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3285,17 +3796,49 @@ Kaksoisnapsauta sitä lisätäksesi hänen nimensä tekstinkirjoittajaan.</trans
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Varmenteen lataus epäonnistui</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Vertaistietoja ei kyetty hakemaan PGP-avaimelle %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Kaikki vertaiset, joita en ole allekirjoittanut</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Ystävieni ystävät, jotka jo luottavat minuun</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Allekirjoitetut vertaiset, jotka näkyvät torjuttuina</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Vertaisen nimi</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Muita allekirjoittaneita</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Vertaisen tunniste</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">Varmenne näyttää olevan kelvollinen</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Ei kelvollinen Retroshare-varmenne!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Retroshare-kutsu</translation>
     </message>
@@ -3317,12 +3860,12 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Tämä on oma varmenteesi! Et haluaisi olla oma ystäväsi. Ethän?</translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3330,7 +3873,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation>Tämä avain on jo luotettujen luettelossa</translation>
     </message>
@@ -3370,7 +3913,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation>Sinulle on ystäväpyyntö, lähettäjä</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3395,7 +3938,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3405,7 +3948,47 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Varmenteen avaaminen epäonnistui: tiedostoa %1 ei löydy</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Vertainen %1 ei ole verkossasi</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Käytä uutta varmenneformaattia (turvallisempi ja vakaampi)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Käytä vanhaa (takaisinpäin yhteensopivaa) varmenneformaattia</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Poista allekirjoitukset</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">Retroshare-kutsu</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Ohje ystävän yhdistämisestä</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Voit kopioida tämän tekstin ja lähettää sen ystävällesi sähköpostilla tai muulla tavoin</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Varmenteesi on kopioitu leikepöydälle, liitä ja lähetä se ystävällesi sähköpostilla tai muulla tavoin</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Tallenna nimellä...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3444,7 +4027,11 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation>*** Ei mitään ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Käytä suorana lähteenä, kun saatavilla</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>IP-osoite:</translation>
     </message>
@@ -3454,7 +4041,7 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <translation>IP-osoite:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Näytä lisäasetukset</translation>
     </message>
@@ -3463,6 +4050,10 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Ystäväsi avaimen allekirjoittamisella ilmaiset luottamuksesi tähän ystävään muille ystävillesi. Se auttaa heitä päättämään salliako yhteydet siitä avaimesta perustuen sinun omaan luottamukseen. Avaimen allekirjoittaminen on täysin vapaaehtoista, eikä sitä voi perua, joten tee niin harkiten.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare käy ajoittain läpi ystäväluettelosi siirtojasi vastaavien selattavien tiedostojen varalta, jotta voitaisiin muodostaa suora siirtoyhteys. Tällaisessa tapauksessa ystäväsi tietää, että lataat tiedostoa.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Estääksesi toiminnan tämän ystävän tapauksessa, poista rasti tästä ruudusta. Voit silti muodostaa suoran siirtoyhteyden halutessasi, esim. lataamalla suoraan ystäväsi tiedostoluettelosta. Tätä asetusta sovelletaan kaikkiin saman solmun sijainteihin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3473,13 +4064,45 @@ Varoitus: Tiedostonsiirto-asetuksissa Salli suora lataus on asetettu Ei.</transl
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tällä asetuksella varustetut vertaiset eivät voi muodostaa yhteyttä, jos heidän osoitteensa ei ole sallittujen luettelossa. Tämä suojelee sinua liikenteen välittämiseen perustuvilta hyökkäyksiltä. Asetuksen myötä hylätyt vertaiset raportoidaan &amp;quot;tietoturvasyötteen nimikkeisiin&amp;quot; Uutissyöte-alueella. Voit sieltä lisätä heidän IP:nsä sallittujen/estettyjen luetteloon. Tämä pätee saman solmun kaikkiin sijainteihin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Suosittele useita ystäviä toisilleen</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Ystäväsuositukset</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">Teksti alapuolella on Retroshare-varmenteesi. Sinun täytyy toimittaa se ystävällesi</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Viesti:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Suosittele ystäviä</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Vastaanottaja</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Ole hyvä ja valitse ainakin yksi ystävä suositeltavaksi.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Ole hyvä ja valitse ainakin yksi ystävä vastaanottajaksi.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Lisää avain avainnippuun</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Tämä avain on jo avainnipussasi</translation>
     </message>
@@ -3495,7 +4118,7 @@ lähettämiseen tälle vertaiselle,
 vaikkette ystävystyisikään.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Varmenteella on väärä versionumero. Muista, että versioiden 0.6 ja 0.5 verkot eivät ole keskenään yhteensopivia.</translation>
     </message>
@@ -3530,7 +4153,7 @@ vaikkette ystävystyisikään.</translation>
         <translation>Lisää IP sallittujen luetteloon</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>Ei IP-osoitetta tässä varmenteessa!</translation>
     </message>
@@ -3540,10 +4163,27 @@ vaikkette ystävystyisikään.</translation>
         <translation>&lt;p&gt;Varmenteessa ei ole IP-osoitetta. Etsintä ja DHT hakevat osoitteen. Vertainen aiheuttaa tietoturvavaroituksen Uutissyöte-välilehdessä, koska olet määrittänyt sallittujen luettelossa olemisen pakolliseksi. Voit sallia vertaisen IP-osoitteen Uutissyöte-välilehdeltä.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished">[Tuntematon]</translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Varmenne lisätty %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Liitä ystäväsi varmenne leikepöydältä</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Varmenteen avaaminen epäonnistui:ei voitu lukea tiedostosta %1</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Varmenteen lataus epäonnistui: jotain on vialla %1</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3605,7 +4245,7 @@ vaikkette ystävystyisikään.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>UDP:n asetukset</translation>
     </message>
@@ -3641,7 +4281,7 @@ 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;Lucida Grande&apos;; font-size:13pt;&quot;&gt;voit sulkea sen.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Yhteysavustaja</translation>
     </message>
@@ -3651,20 +4291,17 @@ p, li { white-space: pre-wrap; }
         <translation>Väärä vertaistunniste</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Tuntematon tila</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Ei yhteyttä</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Symmetrisen NAT:in takana</translation>
     </message>
@@ -3674,14 +4311,12 @@ p, li { white-space: pre-wrap; }
         <translation>NAT:in takana &amp; ilman DHT:tä</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Verkon uudelleenkäynnistys</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>NAT:in takana</translation>
     </message>
@@ -3691,8 +4326,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ei DHT:tä</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>VERKON TILA HYVÄ!</translation>
     </message>
@@ -3717,7 +4351,7 @@ p, li { white-space: pre-wrap; }
         <translation>Haetaan Retroshare-vertaisia</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Haku vaatii DHT:tä</translation>
     </message>
@@ -4009,7 +4643,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yritä tuoda täydellinen varmenne uudelleen</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4017,8 +4651,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ei sovellu</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>VARMISTAMATON VÄLITYS!</translation>
     </message>
@@ -4028,7 +4661,7 @@ p, li { white-space: pre-wrap; }
         <translation>VARMISTAMATON VÄLITYS EIKÄ DHT:TÄ!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Haetaan</translation>
     </message>
@@ -4064,12 +4697,12 @@ p, li { white-space: pre-wrap; }
         <translation>Piirin tiedot</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Piirin nimi, kirjoittajan yhteystiedot ja kutsuttujen jäsenten-luettelo ovat näkyviä kaikille kutsutuille jäsenille. Jos piiri ei ole yksityinen, se tulee olemaan näkyvä myös naapuripiireille, jotka isännöivät kutsuttuja jäseniä.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4089,7 +4722,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>Tunnisteet</translation>
     </message>
@@ -4109,18 +4742,18 @@ p, li { white-space: pre-wrap; }
         <translation>Suodata</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Nimimerkki</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Kutsutut jäsenet</translation>
     </message>
@@ -4135,7 +4768,15 @@ p, li { white-space: pre-wrap; }
         <translation>Tuntemasi ihmiset</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">Tunniste</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Tyyppi</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
@@ -4175,19 +4816,23 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Piirit voidaan rajoittaa vain toisen piirin jäsenille. Vain jäsenet toisesta piiristä saavat nähdä uuden piirin ja sen sisällön (jäsenluettelo, jne).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Näkyy ainoastaan jäsenille:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Anna piirillesi nimi</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Rajoituspiiriä ei valittuna</translation>
     </message>
@@ -4197,24 +4842,12 @@ p, li { white-space: pre-wrap; }
         <translation>Piirien rajoituksia ei valittuna</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Tuntematon]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Lisää</translation>
     </message>
@@ -4224,7 +4857,7 @@ p, li { white-space: pre-wrap; }
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Haku</translation>
@@ -4239,6 +4872,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Allekirjoitettu</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Tunnettujen solmujen allekirjoittama</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4255,6 +4892,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP-henkilöllisyys</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Nimetön tunniste</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4277,13 +4918,17 @@ p, li { white-space: pre-wrap; }
         <translation>Luo uusi piiri</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Luo</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP:n linkitetty tunniste</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Lisää jäsen</translation>
     </message>
@@ -4302,7 +4947,7 @@ p, li { white-space: pre-wrap; }
         <translation>Luo ryhmä</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Ryhmä nimi:</translation>
     </message>
@@ -4337,7 +4982,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Uusi kirjoitus kanavalle</translation>
     </message>
@@ -4347,7 +4992,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanavakirjoitus</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4408,11 +5053,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Vedä ja pudota ja paina Lisää tiedostoja -painiketta uusien tiedostojen hash-arvojen laskemiseksi.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Kopioi ja liitä Retroshare-linkkejä jaetuista tiedostoistasi.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Lisää liitettävä tiedosto</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Lisää kanavan näytekuva</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Viesti</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Aihe:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4498,17 +5155,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4527,18 +5184,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Tiedosto on jo lisätty ja tiivistetty (hash)</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Ole hyvä ja lisää aihe</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Lataa näytekuva</translation>
     </message>
@@ -4553,12 +5209,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Luo massatietoja</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Haluatko todella luoda %1 viestiä?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Olet aikeissa lisätä tiedostoja, joita et todellisuudessa jaa. Haluatko silti tehdä tämän?</translation>
     </message>
@@ -4592,7 +5254,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Lähetä viesti foorumiin</translation>
     </message>
@@ -4601,6 +5263,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Foorumi</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Aihe</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4621,8 +5287,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4641,7 +5307,7 @@ p, li { white-space: pre-wrap; }
         <translation>Voit liittää tiedostoja vetämällä ja pudottamalla niitä tähän ikkunaan</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4671,17 +5337,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Ei foorumia</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>Vastauksena</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Otsikko</translation>
     </message>
@@ -4735,7 +5401,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished">Lataa kuvatiedosto</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>Ei yhteensopiva tunniste tälle foorumille</translation>
     </message>
@@ -4745,8 +5411,8 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Mikään sinun henkilöllisyyksistä ei saa kirjoittaa tälle foorumille. Tämä voi johtua siitä, että foorumi on rajattu piirille, johon sinun henkilöllisyydet eivät kuulu tai foorumi-ilmaisimet vaativat PGP-allekirjoitetun henkilöllisyyden.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Luo massatietoja</translation>
     </message>
@@ -4755,6 +5421,10 @@ Haluatko hävittää tämän viestin?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Haluatko todella luoda %1 viestiä?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Lähetä</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4769,7 +5439,23 @@ Haluatko hävittää tämän viestin?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Luo keskusteluhuone</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Keskusteluhuone on hajautettu ja nimetön keskusteluryhmä. Kaikki osallistujat näkevät kaikki viestit. Kun huone on luotu, voit kutsua muita ystäviäsi Ystävät-välilehdeltä</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Huoneen nimi:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Huoneen aihe:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4804,7 +5490,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Luo</translation>
     </message>
@@ -4814,7 +5500,11 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Jos rastitat tämän, vain PGP-allekirjoitettuja tunnisteita voi käyttää huoneeseen liittymiseen ja siellä keskustelemiseen. Tämä rajoitus estää nimettömän roskaviestittämisen, koska osa huoneessa olevista ihmisistä pystyy paikantamaan roskaviestittäjän solmun.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>vaatii PGP-allekirjoitetut henkilöllisyydet</translation>
     </message>
@@ -4829,7 +5519,11 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Valitse ystävät ryhmäkeskusteluun.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Kutsutut ystävät</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Luo keskusteluhuone</translation>
@@ -4850,7 +5544,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Kontaktit:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Käytä henkilöllisyyttä:</translation>
     </message>
@@ -4858,17 +5552,17 @@ Haluatko hävittää tämän viestin?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Julkiset tiedot</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Sijainti:</translation>
     </message>
@@ -4878,12 +5572,12 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Sijaintitunniste:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Ohjelmiston versio:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Linjoilla alkaen:</translation>
     </message>
@@ -4903,7 +5597,12 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4913,7 +5612,7 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Muita tietoja</translation>
     </message>
@@ -4923,12 +5622,17 @@ Haluatko hävittää tämän viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished">Profiili</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Varmenne</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4938,7 +5642,11 @@ Haluatko hävittää tämän viestin?</translation>
         <translation>Sisällytä allekirjoitukset</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Tallenna avain tiedostoon</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Vie henkilöllisyys</translation>
     </message>
@@ -5012,33 +5720,33 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>PGP-sormenjälki:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Solmun tiedot</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP tunniste:</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Ystäväsolmut:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5077,6 +5785,14 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>Node</source>
         <translation>Solmu</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Luo uusi solmu...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">näytä tilastoikkuna</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5093,6 +5809,10 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Retroshare käyttää Bittorrentin DHT:tä välityspalvelimena yhteyksille. Se ei &quot;tallenna&quot; sinun IP:täsi DHT:n.				                        Sen sijaan DHT:tä käyttävät sinun ystäväsi saadakseen sinuun yhteyden samalla, kun se käsittelee normaaleja DHT-pyyntöjä. 												Tilailmaisin muuttuu vihreäksi heti, kun Retroshare DHT-vastauksen yhdeltäkin ystävältä.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5128,7 +5848,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5796,7 +6516,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Käynnistä tiedosto</translation>
     </message>
@@ -5804,38 +6524,38 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>vastaanottajalle</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>sivuuta kirjainkoko</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>pp.KK.vvvv</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>kB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5843,12 +6563,12 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Lausekevimpain</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Poista tämä lauseke</translation>
     </message>
@@ -6010,7 +6730,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Kuva</translation>
     </message>
@@ -6020,7 +6740,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Ääni</translation>
     </message>
@@ -6080,21 +6800,11 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Ystävien hakemistot</translation>
     </message>
@@ -6216,7 +6926,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation>Tunniste</translation>
     </message>
@@ -6251,6 +6961,10 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>Show State</source>
         <translation>Näytä tila</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">Luetetut solmut</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6258,7 +6972,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Näytä ryhmät</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Ryhmä</translation>
     </message>
@@ -6294,7 +7008,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Lisää ryhmään</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Haku</translation>
@@ -6310,7 +7024,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Lajittele tilan perusteella</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Profiilin tiedot</translation>
     </message>
@@ -6554,7 +7268,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Vahvista ystäväpyyntö</translation>
     </message>
@@ -6571,6 +7285,10 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Haku :</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6592,7 +7310,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Hae ystäviä</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Merkitse kaikki</translation>
     </message>
@@ -6603,134 +7321,16 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Merkitse mitään</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Nimi</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished">Osoite</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Tila</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Ystävysty</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished">Välityspalvelin ei ole käytössä tai on rikki.
-Ovatko kaikki palvelut päällä ja käynnissä??
-Tarkista myös porttisi!</translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Muokkaa tilaviestiä</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Kuulutus</translation>
     </message>
@@ -6813,38 +7413,33 @@ Tarkista myös porttisi!</translation>
         <translation>Palauta oletuskirjasin</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Avainnippu</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Verkko&lt;/h1&gt;                                       &lt;p&gt;Verkko-näkymä näyttää ystäväsolmusi: Retroshare-ystäväsolmut, jotka ovat yhdistettynä sinuun.     &lt;/p&gt;                                                       &lt;p&gt;Voit ryhmitellä solmusi ja näin hienosäätää pääsyä tietoihisi, sallia vain tiettyjen solmujen nähdä vain tietyt tiedostosi.&lt;/p&gt;     &lt;p&gt;Oikealla näet kolme hyödyllistä välilehteä:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Kuulutus lähettää viestejä kaikille linjoilla oleville ystävillesi samanaikaisesti&lt;/li&gt;                                   &lt;li&gt;Paikallinen verkko näyttää sinua ympäröivän verkoston, perustuen etsintätietoihin&lt;/li&gt;                       &lt;li&gt;Avainnippu sisältää keräämäsi solmuavaimet, joista useimmat ovat ystäväsolmujesi välittämiä&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retrosharen kuulutus: viestit lähetetään kaikille linjoilla oleville ystäville.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Verkkokaavio</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Aseta tilaviestisi tähän.</translation>
     </message>
@@ -6862,17 +7457,7 @@ Tarkista myös porttisi!</translation>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Kaikki kentät ovat pakollisia ja vähintään 3 merkkiä</translation>
     </message>
@@ -6882,12 +7467,17 @@ Tarkista myös porttisi!</translation>
         <translation>Salasanat eivät täsmää</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Portti</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation>Ota BOB käyttöön</translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Tämä salasana on PGP:tä varten</translation>
@@ -6908,38 +7498,50 @@ Tarkista myös porttisi!</translation>
         <translation>Uuden varmenteesi luonti epäonnistui, ehkä PGP-salasanasi oli väärin!</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <source>Options</source>
+        <translation type="vanished">Asetukset</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation>PGP-avaimen pituus</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Laita vahva salasana tähän. Tämä salasana suojelee sinun yksityistä solmuavainta!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ole hyvä ja liikuta hiirtäsi ympäriinsä, jolloin autat keräämään satunnaisuutta mahdollisimman paljon. Vähintään 20% tarvitaan solmuavaimiesi luontiin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Normaali solmu</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">TOR/I2P piilotettu solmu</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sinun solmunimesi määrittää Retroshare-instanssin, joka&lt;/p&gt;&lt;p&gt;tulee toimimaan tässä tietokoneessa&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <source>Use existing profile</source>
+        <translation type="vanished">Käytä olemassaolevaa profiilia</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Solmun nimi</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6959,12 +7561,12 @@ Tarkista myös porttisi!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Profiilin nimi yksilöi sinut läpi verkoston.&lt;/p&gt;&lt;p&gt;Ystäväsi käyttävät sitä hyväksyäkseen yhteydet sinulta.&lt;/p&gt;&lt;p&gt;Voit luoda monia Retroshare-solmuja&lt;/p&gt;&lt;p&gt;samalla profiililla eri tietokoneille.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Vie tämä profiili</translation>
     </message>
@@ -6974,43 +7576,42 @@ Tarkista myös porttisi!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämän pitäisi olla Tor Onion-osoite muotoa: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;tai I2P-osoite muodossa: [52 merkkiä].b32.i2p &lt;/p&gt;&lt;p&gt;Saadaksesi sellaisen määritä joko Tor tai I2P luomaan uuden piilotetun palvelu / palvelin-tunnelin. &lt;/p&gt;&lt;p&gt;Voit myös jättää tämän tyhjäksi nyt, mutta solmusi toimii ainoastaan, jos olet oikein määrittänyt Tor/I2P-palvelu osoitteen Asetukset-&amp;gt;Verkko-&amp;gt;Piilotetun palvelun asetusnäkymässä.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Henkilöllisyyksiä käytetään, kun kirjoitat keskusteluhuoneisiin, foorumeille ja kanavakommentteihin. &lt;/p&gt;&lt;p&gt;Ne myös vastaanottavat/lähettävät sähköpostia Retroshare-verkossa. Voit luoda&lt;/p&gt;&lt;p&gt;allekirjoitetun henkilöllisyyden nyt, tai tehdä sen myöhemmin, kun tarvitset sitä.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>Mene!</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation>Tekstiselite</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Lisäasetukset</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>piilotettu osoite</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Profiilisi on kytketty PGP-avainpariin. Retroshare sivuuttaa DSA-avaimet.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä on sinun yhteysportti.&lt;/p&gt;&lt;p&gt;Minkä tahansa arvon 1024 ja 65535 &lt;/p&gt;&lt;p&gt;väliltä pitäisi olla ok. Voit muuttaa sen myöhemmin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7058,13 +7659,13 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>Profiiliasi ei tallennettu. Virhe tapahtui.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Tuo profiili</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Luo uusi profiili ja uusi Retroshare-solmu</translation>
     </message>
@@ -7074,7 +7675,7 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>Luo uusi Retroshare-solmu</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation>Tor/I2P-osoite</translation>
     </message>
@@ -7109,7 +7710,7 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7119,7 +7720,12 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Solmun luonti on kytketty pois päältä kunnes kaikki kentät ovat asetettu oikein.&lt;/p&gt;</translation>
     </message>
@@ -7129,7 +7735,12 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>&lt;p&gt;Solmua ei luoda ennen kuin tarpeeksi satunnaisuutta on kerätty. Ole hyvä ja liikuta hiirtäsi ympäriinsä kunnes saavutat vähintään 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation>I2P-instanssiosoite, jossa BOB on kytketty päälle</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation>I2P-instanssiosoite</translation>
     </message>
@@ -7355,13 +7966,36 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>Aloittaminen</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Kutsu ystäviä</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;Retroshare ei ole mitään ilman ystäviä. Paina nappia aloittaaksesi prosessin.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Lähetä ystävillesi kutsu ja &amp;quot;varmennetunnisteesi&amp;quot; sähköpostilla.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Pyydä myös heiltä vastaava kutsu... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Saat yhteyden ystävääsi vain, jos lisäätte toisenne varmenteet.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Lisää ystäviäsi Retroshareen</translation>
     </message>
@@ -7371,103 +8005,136 @@ ja käyttää tuo-painiketta sen lataamiseen</translation>
         <translation>Lisää ystäviä</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Ota yhteys ystäviin</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&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;
+&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:12pt;&quot;&gt;Kun olette linjoilla ystävienne kanssa samanaikaisesti, Retroshare yhdistää teidät automaattisesti!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Ohjelman on löydettävä Retroshare-verkko, jotta yhteyksien luominen on mahdollista.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Tämä vie 5-30 minuuttia, kun käynnistät Retrosharen ensimmäistä kertaa&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;DHT-merkki tilarivillä muuttuu vihreäksi, kun yhteyksien luominen on mahdollista.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Muutaman minuutin jälkeen NAT-merkki (myös tilarivillä) vaihtuu keltaisesta vihreään.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Jos se pysyy punaisena, sinulla on palomuuri, jonka läpi Retroshare ei pääse.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Katso Lisäapua-osiosta neuvoja yhteyden luomiseksi.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;/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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&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;
 &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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Vaativa: Avaa palomuurin portti</translation>
+&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:12pt;&quot;&gt;Voit parantaa Retrosharen suorituskykyä avaamalla ulkoisen portin.  &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Tämä nopeuttaa yhteyksiä ja sallii useampien käyttäjien olla yhteydessä sinuun. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Helpoin tapa on ottaa UPnP käyttöön langattoman tukiasemasi tai reitittimesi asetuksissa.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Jokainen reititin on erilainen, joten etsi ohjeet reitittimellesi internetin hakukoneilla.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Jos et ymmärrä edellisestä mitään, älä huoli, koska Retroshare toimii joka tapauksessa.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&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;
+&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:12pt;&quot;&gt;Onko sinulla ongelmia päästä Retrosharen kanssa alkuun?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) katso usein kysytyt kysymykset (FAQ Wiki). Se on hieman vanhentunut, yritämme ajantasaistaa sitä.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) tutustu keskustelupalstaamme. Kysele tai keskustele ominaisuuksista.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) kokeile Retrosharen sisäisiä keskustelupalstoja &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- Nämä ilmestyvät näkyviin, kun olet saanut yhteyden ystäviisi.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) jos olet edelleen jumissa, lähetä meille sähköpostia.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Nauti Retrosharetuksesta&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Ota yhteys ystäviin</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&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;
+&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:12pt;&quot;&gt;Kun ystäväsi lähettävät sinulle kutsunsa, klikkaa avataksesi Lisää ystäviä -ikkuna.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Kopioi ja liitä ystäviesi &amp;quot;varmennetunnisteet&amp;quot; ikkunaan ja lisää heidät ystäviksesi.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Vaativa: Avaa palomuurin portti</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Lisää ohjeita ja tukea</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Avaa RS-verkkosivu</translation>
     </message>
@@ -7492,7 +8159,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sähköpostipalaute</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>Retroshare-kutsu</translation>
     </message>
@@ -7542,12 +8209,12 @@ p, li { white-space: pre-wrap; }
         <translation>Palaute Retrosharelle</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>Retrosharen tuki</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Sillä on monia ominaisuuksia, mukaan lukien keskustelu, viestit,</translation>
     </message>
@@ -7671,7 +8338,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Näytä ryhmäkeskustelu</translation>
     </message>
@@ -7679,7 +8346,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[Tuntematon]</translation>
     </message>
@@ -7845,11 +8512,19 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Voit antaa ystäviesi tietää foorumistasi jakamalla sen heidän kanssaan. Valitse ystävät, joiden kanssa haluat jakaa foorumin.</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">Jaa keskustelunaihe ylläpitooikeuksia</translation>
+    </message>
+    <message>
+        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
+        <translation type="vanished">Voit sallia ystäviesi muokata aihetta. Valitse heidät alla olevasta luettelosta. Huomautus: Lähetettyjen ylläpito-oikeuksia ei voi kumota.</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Otsikko</translation>
     </message>
@@ -7862,12 +8537,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7892,7 +8567,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">Laskeva järjestys</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">Nouseva järjestys</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">Järjestä nimen mukaan</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Järjestä suosion mukaan</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Järjestä viimeisimmän viestin mukaan</translation>
+    </message>
+    <message>
+        <source>Sort by Number of Posts</source>
+        <translation type="vanished">Järjestä viestien määrän mukaan</translation>
+    </message>
+    <message>
+        <source>Sort by Unread</source>
+        <translation type="vanished">Järjestä lukemattomien mukaan</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Olet ylläpitäjä (muokkaa nimiä ja kuvaksia käyttäen Muokkaa-valikkoa)</translation>
     </message>
@@ -7907,14 +8610,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Tunniste</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Viimeisin viesti</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
@@ -7925,13 +8628,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Suosio</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Ei koskaan</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Näytä</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7944,7 +8651,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>ja</translation>
     </message>
@@ -8080,7 +8787,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanavat</translation>
@@ -8091,22 +8798,26 @@ p, li { white-space: pre-wrap; }
         <translation>Luo kanava</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Ota käyttöön automaattinen lataus</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Kanavani</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Kanavat&lt;/h1&gt;        &lt;p&gt;Kanavat sallivat sinun lähettää dataa (esim. elokuvia, musiikkia) , jotka leviävät verkostossa.&lt;/p&gt;                &lt;p&gt;Voit nähdä mitä kanavia ystäväsi tilaavat, ja automaattisesti edelleenlähettää tilatut kanavat ystävillesi. Tämä edistää verkoston hyviä kanavia.&lt;/p&gt;    &lt;p&gt;Ainoastaan kanavan luoja pystyy lähettämään kyseiselle kanavalle. Muut vertaiset verkostossa pystyvät vain lukemaan sitä, ellei kanava ole yksityinen. Kaikesta huolimatta voit jakaa 	 lähetys- tai luku-oikeuksia ystäviesi Retroshare-solmuille.&lt;/p&gt;	 &lt;p&gt;Kanavista voidaan tehdä nimettömiä, tai niihin voidaan liittää Retroshare-henkilöllisyys, että lukijat voivat yhteyden sinuun tarvittaessa.	 Salli &quot;Salli kommentit&quot;, jos haluat käyttäjien kommentoivan viestejäsi.&lt;/p&gt;    &lt;p&gt;Kanavan viestit säilyvät %1 päivää, and pidetään ajan tasalla %2 päivän ajan, ellet sinä muuta tätä.&lt;/p&gt;                </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Tilatut kanavat</translation>
     </message>
@@ -8126,12 +8837,12 @@ p, li { white-space: pre-wrap; }
         <translation>Valitse kanavan lataushakemisto</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Ota automaattinen lataus pois käytöstä</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>Aseta lataushakemisto</translation>
     </message>
@@ -8166,22 +8877,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Toista</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Avaa kansio</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
@@ -8201,17 +8912,17 @@ p, li { white-space: pre-wrap; }
         <translation>Tarkistetaan</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Oletko varma, että haluat peruuttaa ja poistaa tiedoston?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Kansiota ei voida avata</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Toista tiedosto</translation>
     </message>
@@ -8221,10 +8932,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Tiedostoa %1 ei löydy sijainnista.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Lomake</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Tiedostonimi</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Koko</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Otsikko</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Julkaistu</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Tila</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Luo uusi kanava</translation>
     </message>
@@ -8262,19 +9000,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Tilaa kanava</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8288,7 +9016,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -8303,7 +9031,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanavan kuvaus</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Ladataan</translation>
     </message>
@@ -8318,9 +9046,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">Ei koskaan</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Uusi kanava</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8331,7 +9058,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Uusi kommentti:</translation>
     </message>
@@ -8352,7 +9079,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Toista</translation>
     </message>
@@ -8408,24 +9135,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Tiedostot</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Varoitus! Sinulla on alle %1 tuntia ja %2 minuuttia aikaa, ennen kuin tämä tiedosto poistetaan. Harkitse sen tallentamista.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Kommentti</translation>
     </message>
@@ -8440,17 +9171,21 @@ p, li { white-space: pre-wrap; }
         <translation>En pidä tästä</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Ladataan</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation>Kommentit</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8475,16 +9210,139 @@ p, li { white-space: pre-wrap; }
         <translation>Toista media</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Lähetä viesti kanavalle</translation>
+    </message>
+    <message>
+        <source>Add new post</source>
+        <translation type="vanished">Lisää uusi kirjoitus</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Ladataan</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Hae kanavia</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Otsikko</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Hae otsikolla</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Viesti</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Hae viestejä</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Tiedostonimi</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Hae tiedostonimiä</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Ei kanavaa valittuna</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Ei koskaan</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Julkinen</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle &quot;</source>
+        <translation type="vanished">Rajoitettu piirin jäseniin &quot;</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle </source>
+        <translation type="vanished">Rajoitettu piirin jäseniin</translation>
+    </message>
+    <message>
+        <source>Your eyes only</source>
+        <translation type="vanished">Vain silmillesi</translation>
+    </message>
+    <message>
+        <source>You and your friend nodes</source>
+        <translation type="vanished">Sinä ja ystäväsolmusi</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Ota automaattinen lataus pois käytöstä</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Ota käyttöön automaattinen lataus</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Näytä syötteet</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Näytä tiedostot</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Ylläpitäjä:</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Viimeisin viesti:</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">tuntematon</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Jakelu:</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Syötteet</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Tiedostot</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Tilaajat</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Kuvaus:</translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">Viestit (naapurisolmuissa):</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Lähetä viesti kanavalle</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished">Lisää uusi kirjoitus</translation>
     </message>
@@ -8554,7 +9412,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8590,7 +9448,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentit</translation>
     </message>
@@ -8605,13 +9463,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Syötteet</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8626,7 +9484,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8641,7 +9499,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8701,22 +9559,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8791,13 +9639,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Sinä ja ystäväsolmusi</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Tilattu</translation>
     </message>
@@ -8848,17 +9695,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8878,11 +9725,27 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Poista kohde</translation>
     </message>
+    <message>
+        <source>for identity </source>
+        <translation type="vanished">henkilöllisyydelle</translation>
+    </message>
+    <message>
+        <source>You received a membership request for circle:</source>
+        <translation type="vanished">Olet vastaanottanut jäsenyyspyydön piiriin:</translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Myönnä jäsenyyspyyntö</translation>
     </message>
+    <message>
+        <source>Revoke membership request</source>
+        <translation type="vanished">Kumoa jäsenyyspyyntö</translation>
+    </message>
+    <message>
+        <source>You received an invitation for circle:</source>
+        <translation type="vanished">Olet vastaanottanut kutsun piiriin:</translation>
+    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -8973,7 +9836,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Kommenttisäiliö</translation>
     </message>
@@ -8986,7 +9849,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9016,7 +9879,7 @@ p, li { white-space: pre-wrap; }
         <translation>Päivitä</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Kommentti</translation>
@@ -9055,7 +9918,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Vastaa kommenttiin</translation>
     </message>
@@ -9079,21 +9942,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Äänestä alas</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9103,7 +9951,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lisää kommentti</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9132,10 +9980,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Kommentti&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Allekirjoittaja</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9164,7 +10028,7 @@ before you can comment</source>
 kuin voit kommentoida</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9206,6 +10070,14 @@ kuin voit kommentoida</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Lisää ylläpitäjiä foorumiin</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Valitse foorumin ylläpitäjiä</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9215,7 +10087,7 @@ kuin voit kommentoida</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Tilaa foorumi</translation>
     </message>
@@ -9231,7 +10103,7 @@ kuin voit kommentoida</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -9251,9 +10123,8 @@ kuin voit kommentoida</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Ladataan</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9284,13 +10155,13 @@ kuin voit kommentoida</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Aihe:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Lopeta foorumin tilaus</translation>
     </message>
@@ -9301,7 +10172,7 @@ kuin voit kommentoida</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -9321,17 +10192,21 @@ kuin voit kommentoida</translation>
         <translation>Vastauksena:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Ladataan</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Foorumisyöte</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
@@ -9344,66 +10219,63 @@ kuin voit kommentoida</translation>
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Aloita uusi viestiketju valitussa foorumissa</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Hae foorumeista</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Viimeisin viesti</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation>Uusi viestiketju</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Ketjunäkymä</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Tasanäkymä</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Otsikko</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Päiväys</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Kirjoittaja</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Tallenna kuva</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Ladataan</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9413,7 +10285,12 @@ kuin voit kommentoida</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Vastaa viestiin</translation>
     </message>
@@ -9437,6 +10314,10 @@ kuin voit kommentoida</translation>
         <source>Download all files</source>
         <translation>Lataa kaikki tiedostot</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Seuraava lukematon</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9453,23 +10334,35 @@ kuin voit kommentoida</translation>
         <translation>Hae kirjoittajaa</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Sisältö</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Hae sisältöä</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Foorumin tilaaminen kerää 	                                        kaikki saatavilla olevat viestit tilaajaystäviltäsi, ja tekee 	                                        foorumista näkyvän kaikille muille ystävillesi.&lt;/p&gt;&lt;p&gt;Myöhemmin voit peruuttaa tilauksen foorumin kontekstivalikosta vasemmalla.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Ei nimeä</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Vastaa</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9512,12 +10405,20 @@ kuin voit kommentoida</translation>
         <translation>Kopioi Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Laajenna</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Pannassa]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[tuntematon]</translation>
     </message>
@@ -9547,8 +10448,8 @@ kuin voit kommentoida</translation>
         <translation>Vain silmillesi</translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9562,6 +10463,26 @@ kuin voit kommentoida</translation>
         <source>Anti-spam</source>
         <translation>Roskapostin esto</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Muokattu viesti ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Nimetön</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">allekirjoitettu</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">ei mitään</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Puuttuva viesti ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9631,12 +10552,16 @@ kuin voit kommentoida</translation>
         <translation>Alkuperäinen viesti</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation>Uusi viestiketju</translation>
     </message>
     <message>
-        <location line="+331"/>
+        <source>Read status</source>
+        <translation type="vanished">Lue tilaviesti</translation>
+    </message>
+    <message>
+        <location line="+318"/>
         <source>Edit</source>
         <translation>Muokkaa</translation>
     </message>
@@ -9697,7 +10622,7 @@ kuin voit kommentoida</translation>
         <translation>Kirjoittajan maine</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9717,7 +10642,7 @@ kuin voit kommentoida</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Nimettömät/tuntemattomat viestit lähetetään edelleen, jos maine on myönteinen</translation>
     </message>
@@ -9769,7 +10694,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9779,7 +10704,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9794,7 +10719,29 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <source>Information for this identity is currently missing.</source>
+        <translation type="vanished">Tämän henkilöllisyyden tiedot ovat tällä hetkellä kateissa.</translation>
+    </message>
+    <message>
+        <source>You have banned this ID. The message will not be
+displayed nor forwarded to your friends.</source>
+        <translation type="vanished">Olet laittanut tämän tunnisteen pannaan. Viestiä ei
+näytetä eikä lähetä eteenpäin ystävillesi.</translation>
+    </message>
+    <message>
+        <source>You have not set an opinion for this person,
+ and your friends do not vote positively: Spam regulation 
+prevents the message to be forwarded to your friends.</source>
+        <translation type="vanished">Et ole asettanut mielipidettä tästä henkilöstä,
+ ja ystäväsi eivät äänestä myönteisesti: Roskapostin säätely 
+estää viestin lähettämisen eteenpäin ystävillesi.</translation>
+    </message>
+    <message>
+        <source>Message will be forwarded to your friends.</source>
+        <translation type="vanished">Viesti tullaan välittämään ystävillesi.</translation>
+    </message>
+    <message>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation>(Viimeisin) </translation>
     </message>
@@ -9803,6 +10750,10 @@ This message is missing. You should receive it later.</source>
         <source>(Old) </source>
         <translation>(Vanha)</translation>
     </message>
+    <message>
+        <source>You cant act on the author to a non-existant Message</source>
+        <translation type="vanished">Et voi ottaa toimia olemattoman viestin kirjoittajan suhteen</translation>
+    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -9860,12 +10811,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Foorumit&lt;/h1&gt;               			&lt;p&gt;Retrosharen foorumit toimivat hajautetusti&lt;/p&gt;    			&lt;p&gt;Näet foorumit, jotka ystäväsi ovat tilanneet ja vastaavasti välität tilaamasi foorumit      			 ystävillesi. Tällä tavoin kiinnostavien foorumeiden näkyvyys lisääntyy automaattisesti.&lt;/p&gt;                        &lt;p&gt;Foorumiviestit pidetään %1 päivän ajan ja ajantasaistetaan viimeisiltä %2 päivältä ellet määritä sitä toisin.&lt;/p&gt;                </translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Foorumi</translation>
@@ -9896,16 +10847,35 @@ This message is missing. You should receive it later.</source>
         <translation>Muut foorumit</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Odotetaan</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Noudetaan</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Ladataan</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Lisää kuvake</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Avaimen vastaanottajat voivat julkaista rajoitetuille ryhmille ja voivat nähdä sekä julkaista yksityisille kanaville</translation>
     </message>
@@ -9914,14 +10884,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Jaa julkaisuavain</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">rastita vertaiset, joiden kanssa haluat jakaa yksityisen julkaisuavaimesi</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Jaa avain</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Viestin leviäminen</translation>
     </message>
@@ -9929,7 +10907,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Julkinen</translation>
     </message>
@@ -9948,6 +10926,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Uusi viestiketju</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Vaaditaan</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Salatut viestit</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9989,7 +10975,7 @@ This message is missing. You should receive it later.</source>
         <translation>Roskaposti-suojaus</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Kommentit:</translation>
     </message>
@@ -10012,7 +10998,7 @@ This message is missing. You should receive it later.</source>
         <translation>Roskapostin esto:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10028,12 +11014,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation>Rajoitettu piiriin:</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation>Rajattu ystäviisi</translation>
     </message>
@@ -10050,23 +11036,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>Viestiseuranta</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>PGP-allekirjoitus vaaditaan</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Ei koskaan</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation>Vain ryhmässä olevat ystäväsolmut</translation>
     </message>
@@ -10082,28 +11068,30 @@ This message is missing. You should receive it later.</source>
         <translation>Ole hyvä ja lisää nimi</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>PGP-allekirjoitus tunnetulta tunnisteelta vaaditaan </translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Lataa ryhmän logo</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Vahvista ryhmän muutokset</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Ryhmän metatietojen luonti epäonnistui - tarkista tiedot</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Käytetään palautteen lähettämiseen</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Omistaja:</translation>
     </message>
@@ -10113,12 +11101,12 @@ This message is missing. You should receive it later.</source>
         <translation>Aseta kuvaava kuvaus tähän</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Tietoja</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>Tunniste</translation>
     </message>
@@ -10128,7 +11116,7 @@ This message is missing. You should receive it later.</source>
         <translation>Viimeisin viesti</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Viestit leviävät ystäväsolmujen ulkopuolelle, niin kauan kun ihmiset tilaavat kanavan/foorumin/lähetetyn, jolle luot sisältöä.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -10203,12 +11191,7 @@ This message is missing. You should receive it later.</source>
         <translation>Haittaa allekirjoittamattomia tunnisteita ja tunnisteita tuntemattomista solmuista</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Suosio</translation>
     </message>
@@ -10224,22 +11207,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Luo</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Kirjoittaja</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>GxsTunnisteselite</translation>
     </message>
@@ -10247,7 +11235,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Ladataan</translation>
     </message>
@@ -10307,7 +11295,7 @@ This message is missing. You should receive it later.</source>
         <translation>Muokkaa tietoja</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation>Ajantasaista viestit ajalta...</translation>
     </message>
@@ -10364,12 +11352,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <source>Share publish permissions</source>
+        <translation type="vanished">Jaa julkaisuoikeudet</translation>
+    </message>
+    <message>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopioi Retroshare-linkki</translation>
     </message>
@@ -10392,7 +11384,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Ei allekirjoitusta</translation>
     </message>
@@ -10405,24 +11397,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Ladataan</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Ei löydy</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Ei allekirjoitusta</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Pannassa]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Varmennus</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>tuntematon avain</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">nimetön</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10432,12 +11440,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Henkilöllisyyden&amp;nbsp;nimi</translation>
     </message>
@@ -10451,20 +11454,16 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished">Solmu</translation>
     </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">Allekirjoittama</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Tuntematon]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10476,7 +11475,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10524,13 +11523,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Tuntematon]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Ladataan</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10647,6 +11650,10 @@ This message is missing. You should receive it later.</source>
         <source>Group ID / Author</source>
         <translation>Ryhmätunniste / Kirjoittaja</translation>
     </message>
+    <message>
+        <source>Number of messages / Publish TS</source>
+        <translation type="vanished">Viestien määrä / Julkaise liikennetilastot</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -10662,6 +11669,10 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation>Suosio</translation>
     </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Tiedot</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -10694,6 +11705,33 @@ This message is missing. You should receive it later.</source>
         <translation>Ei</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">Varmennetut tunnelit:</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">Tunnelitunniste: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">tila: %1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">lähetetty yhteensä: %1 tavua</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">vastaanotettu yhteensä: %1 tavua</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Tuntematon vertainen</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10906,12 +11944,48 @@ This message is missing. You should receive it later.</source>
         <source>About</source>
         <translation>Tietoja</translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Retroshare on avoimen lähdekoodin alustariippumaton, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;yksityinen ja turvallinen hajautettu viestintäalusta.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Se antaa sinun jakaa turvallisesti ystäväsi, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;käyttäen luottamuksen verkkoa todentaakseen vertaiset ja OpenSSL kaiken viestinnän salaukseen. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Retroshare tarjoaa tiedostojen jakamisen, keskustelun, viestit ja kanavat&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Hyödyllisiä ulkoisia linkkejä lisätietoja varten:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare verkkosivu&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retrosharen foorumi&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare projekti-sivu&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare työryhmän blogi&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare kehittäjien Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+37"/>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10927,7 +12001,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Tekijät</translation>
     </message>
@@ -10946,7 +12020,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10959,6 +12033,36 @@ 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Retroshare käännökset:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Retroshare verkkosivuston kääntäjät:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Ruotsi: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Saksa: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Puola: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -11024,12 +12128,12 @@ p, li { white-space: pre-wrap; }
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+121"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+158"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11044,7 +12148,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11053,12 +12157,32 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Did you receive a certificate from a friend?</source>
+        <translation type="vanished">Saitko varmenteen ystävältäsi?</translation>
+    </message>
+    <message>
+        <source>Add friends certificate</source>
+        <translation type="vanished">Lisää ystäväsi varmenne</translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">Lisää varmenne-tiedosto</translation>
+    </message>
+    <message>
+        <source>Share your RetroShare Key</source>
+        <translation type="vanished">Jaa Retroshare-avaimesi</translation>
+    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
+        <translation type="vanished">Teksti alapuolella on Retroshare-varmenteesi. Lähetä se ystävillesi</translation>
+    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -11069,12 +12193,20 @@ yksityinen ja turvallinen hajautettu viestintäalusta.
 </translation>
     </message>
     <message>
-        <location line="+134"/>
+        <source>Launch startup wizard</source>
+        <translation type="vanished">Käynnistä ohjattu aloitus</translation>
+    </message>
+    <message>
+        <source>Do you need help with RetroShare?</source>
+        <translation type="vanished">Tarvitsetko apua Retrosharen kanssa?</translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>Open Web Help</source>
         <translation>Avaa verkkotuki (englanniksi)</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Kopioi varmenteesi leikepöydälle</translation>
     </message>
@@ -11084,7 +12216,7 @@ yksityinen ja turvallinen hajautettu viestintäalusta.
         <translation>Tallenna varmenteesi tiedostoon</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>Lähetä sähköpostitse</translation>
     </message>
@@ -11104,37 +12236,13 @@ yksityinen ja turvallinen hajautettu viestintäalusta.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11146,12 +12254,17 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+16"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11160,11 +12273,19 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Tervetuloa Retroshareen!&lt;/h1&gt;   &lt;p&gt;Sinun pitää &lt;b&gt;tehdä ystäviä&lt;/b&gt;! Kun olet luonut ystäväverkoston tai liittynyt olemassa olevaan verkostoon	  voit vaihtaa tiedostoja, keskustella, jutustella foorumeilla, jne. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;Näin tehdäksesi, kopioi varmenteesi tällä sivulla ja lähetä se ystävillesi, ja lisää ystäviesi varmenteet.&lt;/p&gt;    &lt;p&gt;Toinen vaihtoehto on etsiä internetistä &quot;Retroshare chat servers&quot; (itsenäisesti hallinnoituja). Nämä palvelimet antavat sinun vaihtaa 	varmenteita palvelin Retroshare-solmun kanssa, jonka kautta	  voit nimettömästi tavata muita ihmisiä.&lt;/p&gt; </translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Retroshare-kutsu</translation>
     </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Varmenteesi on kopioitu leikepöydälle, liitä ja lähetä se ystävällesi sähköpostilla tai muulla tavoin</translation>
+    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -11436,14 +12557,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Kaikki</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Maine</translation>
     </message>
@@ -11453,12 +12574,12 @@ p, li { white-space: pre-wrap; }
         <translation>Haku</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>Nimetön tunniste</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Luo uusi henkilöllisyys</translation>
     </message>
@@ -11468,7 +12589,7 @@ p, li { white-space: pre-wrap; }
         <translation>Luo uusi piiri</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>Henkilöt</translation>
     </message>
@@ -11483,27 +12604,27 @@ p, li { white-space: pre-wrap; }
         <translation>Henkilö</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation>Pannaus-vaihtoehto:</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Automaattisesti pannaa kaikki henkilöllisyydet, jotka ovat saman solmun allekirjoittamia</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation>Ystävän äänet:</translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Myönteisiä ääniä</translation>
     </message>
@@ -11519,39 +12640,29 @@ p, li { white-space: pre-wrap; }
         <translation>Kielteisiä ääniä</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation>Käyttötilastot</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Piirit</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Piirin nimi</translation>
     </message>
@@ -11571,20 +12682,18 @@ p, li { white-space: pre-wrap; }
         <translation>Henkilökohtaiset piirit</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Muokkaa henkilöllisyyttä</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Poista henkilöllisyys</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Keskustele vertaisen kanssa</translation>
     </message>
@@ -11594,78 +12703,98 @@ p, li { white-space: pre-wrap; }
         <translation>Käynnistää etäisen keskustelun vertaisen kanssa</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation>Omistajasolmun tunniste:</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Henkilöllisyyden nimi:</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>Henkilöllisyystunniste</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Lähetä viesti</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Henkilöllisyyden tiedot</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Henkilöllisyystunniste:</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Omistajasolmun nimi:</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation>Luo uusi...</translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Tyyppi:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Lähetä kutsu</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Naapurisolmujen mielipiteiden keskiarvo tästä henkilöllisyydestä. Kielteinen on huono,&lt;/p&gt;&lt;p&gt;myönteinen on hyvä. Nolla on neutraali.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>Sinun mielipiteesi:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Sinun oma mielipiteesi henkilöllisyydestä määrittää kyseisen henkilöllisyyden näkyvyyden itsellesi ja ystäväsolmuille. Sinun oma mielipiteesi jaetaan ystäviesi kesken ja käytetään maineen pisteytyksen laskemiseen: Jos mielipiteesi henkilöllisyydestä on neutraali, maineen pisteytys lasketaan ystäviesi myönteisten ja kielteisten mielipiteiden erotuksesta. Jos ei, sinun oma mielipiteesi antaa pisteytyksen.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Kokonaispisteytystä käytetään keskusteluauloissa, foorumeilla ja kanavilla toimien määrittämiseen kullekin tietylle henkilöllisyydelle. Kun kokonaispisteytys on alle -1, henkilöllisyys asetetaan pannaan, joka estää tämän henkilöllisyyden kirjoittamien kaikkien viestien ja foorumien/kanavien eteenpäin välityksen, kumpaankin suuntaan. Jotkin foorumit omaavat myös erikois roskapostinestoilmaisimia, jotka vaativat ei-kielteisen maineen tason, tehden niistä herkempiä huonoille mielipiteille. Pannassa olevat henkilöllisyydet vähitellen menettävät toimeliaisuuden ja lopulta katoavat (5 päivän jälkeen).&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Sinä voit muuttaa kynnyksiä ja toimettomuuden aikaa henkilöllisyyksien poistamiseen asetuksista -&amp;gt; Ihmiset. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Kielteinen</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>Neutraali</translation>
     </message>
@@ -11676,17 +12805,17 @@ p, li { white-space: pre-wrap; }
         <translation>Myönteinen</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kokonaismainepisteytys, mukaan laskien sinun sekä ystäviesi.&lt;/p&gt;&lt;p&gt;Kielteinen on huono, myönteinen on hyvä. Nolla on neutraali. Jos pisteytys on liian alhainen,&lt;/p&gt;&lt;p&gt;henkilöllisyys merkitään huonoksi, ja tullaan suodattamaan pois foorumeilta, keskusteluauloista,&lt;/p&gt;&lt;p&gt;kanavilta, jne.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Yhteensä:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Nimetön</translation>
     </message>
@@ -11701,24 +12830,24 @@ p, li { white-space: pre-wrap; }
         <translation>Hae tunnistetta</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Tämä henkilöllisyys on sinun omistamasi</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>Minun henkilöllisyyteni</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation>Näytä kohteet</translation>
     </message>
@@ -11733,12 +12862,7 @@ p, li { white-space: pre-wrap; }
         <translation>Linkitetty solmuuni</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>Muut piirit</translation>
     </message>
@@ -11748,7 +12872,7 @@ p, li { white-space: pre-wrap; }
         <translation>Piirit joihin kuulun</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>Piiri tunniste:</translation>
     </message>
@@ -11823,7 +12947,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ei jäsen (ei ole pääsyä tälle piirille rajoitettuun dataan)</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>Henkilöllisyystunniste:</translation>
     </message>
@@ -11853,7 +12977,7 @@ p, li { white-space: pre-wrap; }
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>Kutsuttu</translation>
     </message>
@@ -11868,7 +12992,7 @@ p, li { white-space: pre-wrap; }
         <translation>Jäsen</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>Muokkaa piiriä</translation>
     </message>
@@ -11916,7 +13040,7 @@ p, li { white-space: pre-wrap; }
         <translation>Myönnä jäsenyys</translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11927,7 +13051,7 @@ Sinun pitäisi hankkiutua siitä eroon ja käyttää uutta.
 Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Tuntematon solmu]</translation>
@@ -11970,7 +13094,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Nimetön henkilöllisyys</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12050,7 +13174,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation>tietoa</translation>
     </message>
@@ -12066,12 +13190,29 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Kopioi henkilöllisyys leikepöydälle</translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <source>Send invite?</source>
+        <translation type="vanished">Lähetä kutsu?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Haluatko todella lähettää kutsun varmenteellasi?</translation>
+    </message>
+    <message>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Pannassa</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown ID:</source>
+        <translation type="vanished">Tuntematon tunniste:</translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation>positiviinen</translation>
     </message>
@@ -12115,11 +13256,19 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>Forums</source>
         <translation>Foorumit</translation>
     </message>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Lähetetty</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Keskustelu</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Tuntematon</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12140,6 +13289,14 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>Kirjoittajan allekirjoituksen luonti palvelussa %1</translation>
     </message>
+    <message>
+        <source>Message/vote/comment</source>
+        <translation type="vanished">Viesti/ääni/kommentti</translation>
+    </message>
+    <message>
+        <source>%1 in %2 tab</source>
+        <translation type="vanished">%1 %2 välilehdessä</translation>
+    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12160,11 +13317,19 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Allekirjoitus etäisessä tunnelijärjestelmässä.</translation>
     </message>
+    <message>
+        <source>Update of identity data.</source>
+        <translation type="vanished">Henkilöllisyys-datan päivitys.</translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Yleinen allekirjoituksen vahvistaminen.</translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">Yleinen allekirjoitus.</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12176,7 +13341,11 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Yleinen salauksen purku.</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <source>Membership verification in circle %1.</source>
+        <translation type="vanished">Jäsenyyden varmistus piirissä %1.</translation>
+    </message>
+    <message>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12226,21 +13395,21 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Hei,&lt;br&gt;haluan olla ystäväsi Retrosharessa.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Ihmiset</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Sinun avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>Linkitetty naapurisolmuihin</translation>
     </message>
@@ -12250,7 +13419,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Linkitetty etäisiin solmuihin</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Linkitetty ystävä Retroshare-solmuun</translation>
     </message>
@@ -12265,7 +13434,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Linkitetty tuntemattomaan Retroshare-solmuun</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Keskustele henkilön kanssa</translation>
     </message>
@@ -12280,12 +13449,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Tämä henkilö torjui etäisen keskustelun</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>Viimeksi käytetty:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 tiedettyä PGP:tä</translation>
     </message>
@@ -12305,12 +13474,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Haluatko todella poistaa tämän henkilöllisyyden?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Omistama</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Solmun nimi:</translation>
     </message>
@@ -12320,7 +13489,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Solmun tunniste :</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>Tuhotaanko?</translation>
     </message>
@@ -12328,7 +13497,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Nimimerkki</translation>
     </message>
@@ -12358,7 +13527,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Nimimerkki</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12368,19 +13537,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Uusi henkilöllisyys</translation>
     </message>
@@ -12394,7 +13556,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12404,12 +13566,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Ei sovellu</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Muokkaa henkilöllisyyttä</translation>
@@ -12420,27 +13577,27 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished">Päivitä</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12460,7 +13617,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12470,7 +13627,11 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Virhe haettaessa avainta!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Virhe: viallinen avaimen tunniste</translation>
     </message>
@@ -12485,7 +13646,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Tuntematon oikea nimi</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Luo uusi henkilöllisyys</translation>
     </message>
@@ -12495,15 +13656,10 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Poista</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12529,7 +13685,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Lisää</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Luo</translation>
     </message>
@@ -12539,13 +13695,17 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Sinun avatar</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Aseta Avatar</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>Linkitetty profiiliisi</translation>
     </message>
@@ -12555,7 +13715,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Sinulla voi olla yksi tai useampi henkilöllisyys. Niitä käytetään usein kirjoitettaessa keskusteluhuoneisiin, foorumeille ja kanavakommentteihin. Ne toimivat kohteena etäiselle keskustelulle ja Retrosharen etäiselle postijärjestelmälle.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Nimimerkki on liian lyhyt. Syötä vähintään %1 merkkiä.</translation>
     </message>
@@ -12614,6 +13774,10 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>PGP name:</source>
         <translation>PGP-nimi:</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">GXS tunniste:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12629,7 +13793,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Kopioi</translation>
     </message>
@@ -12639,12 +13803,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Merkitse kaikki</translation>
     </message>
@@ -12663,38 +13827,26 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>Quote</source>
         <translation type="unfinished">Lainaa</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Lähetä</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Tallenna kuva</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Ei voi tallentaa kuvaa, virheellinen tiedostonnimi</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation>Ei ole kuva</translation>
     </message>
@@ -12712,32 +13864,27 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Portti:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Tila:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12758,12 +13905,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12772,31 +13914,26 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Avaa kansio</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Tarkistaa...</translation>
     </message>
@@ -12806,7 +13943,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Tarkista tiedostot</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation>Suosittele viestissä vastaanottajalle...</translation>
     </message>
@@ -12834,7 +13971,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Lisää ystävä</translation>
     </message>
@@ -12850,8 +13987,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Asetukset</translation>
     </message>
@@ -12872,7 +14008,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Lopeta</translation>
     </message>
@@ -12883,12 +14019,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Ohjattu nopea käynnistys</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>Retroshare %1 turvallinen hajautettu viestintäalusta</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Kesken</translation>
     </message>
@@ -12917,12 +14053,11 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Huomauta</translation>
     </message>
@@ -12933,35 +14068,31 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Avaa viestit</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Siirtonopeuskuvaaja</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Ohjelmat</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Ohje</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Pienennä</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Suurenna</translation>
     </message>
@@ -12976,12 +14107,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 uusi viesti</translation>
     </message>
@@ -13011,7 +14137,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>%1 ystävää yhdistettynä</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Haluatko todella poistua Retrosharesta?</translation>
     </message>
@@ -13031,7 +14157,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Varmista, että tämä linkki ei ole huijaus, joka johtaa haitalliselle sivustolle.</translation>
     </message>
@@ -13076,13 +14202,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Palveluiden käyttöoikeudet</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Näytä verkkokäyttöliittymä</translation>
     </message>
@@ -13097,7 +14222,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>on käymässä vähiin (tämänhetkinen raja on </translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>Lopeta?</translation>
     </message>
@@ -13106,17 +14231,17 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Kirjoita viesti</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Yhteystiedot</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Kappale</translation>
     </message>
@@ -13152,12 +14277,12 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Otsikko 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Kirjasinkoko</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Suurenna kirjasinkokoa</translation>
     </message>
@@ -13172,32 +14297,32 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Lihavointi</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Kursivointi</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Asettelu</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Lisää kuva</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Asettaa tekstin kirjasinlajin koodityyliseksi</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Alleviivaus</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Aihe:</translation>
     </message>
@@ -13208,32 +14333,32 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Merkkaukset</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>Osoiteluettelo:</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation>Suosittele tätä ystävää</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Aseta tekstin väri</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Aseta tekstin taustaväri</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Suositellut tiedostot</translation>
     </message>
@@ -13303,7 +14428,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>Lisää lainauslohko (blockquote)</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Lähetä:</translation>
     </message>
@@ -13327,6 +14452,10 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <source>&amp;Justify</source>
         <translation>Tasaa &amp;molemmat reunat</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">Kaikki osoitteet (sekaisin)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13338,7 +14467,7 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hei,&lt;br&gt;suosittelen ystävääni; voit luottaa häneen, kuten luotat minuun.&lt;br&gt;</translation>
     </message>
@@ -13358,18 +14487,18 @@ Näitä henkilöllisyyksien tuki lakkaa pian.</translation>
         <translation>haluaa olla ystäväsi Retrosharessa</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hei %1,&lt;br&gt;&lt;br&gt;%2 haluaa olla ystäväsi Retrosharessa.&lt;br&gt;&lt;br&gt;Vastaa nyt:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Kiittäen,&lt;br&gt;Retroshare-tiimi.</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Tallenna viesti</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Viestiä ei ole lähetetty.
@@ -13381,17 +14510,7 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Liitä Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Lisää vastaanottajiin</translation>
     </message>
@@ -13411,7 +14530,7 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Lisää suosituksena</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Alkuperäinen viesti</translation>
     </message>
@@ -13421,21 +14540,21 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Lähettäjä</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Vastaanottaja</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Kopio</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Lähetetyt</translation>
     </message>
@@ -13450,7 +14569,7 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>%1, %2 kirjoitti:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Vs:</translation>
     </message>
@@ -13460,30 +14579,30 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Vl:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Haluatko lähettää viestin ilman otsikkoa?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Ole hyvä ja lisää ainakin yksi vastaanottaja.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Piilokopio</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Tuntematon</translation>
     </message>
@@ -13598,13 +14717,13 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Avaa tiedosto...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-tiedostot (*.htm *.html);;Kaikki tiedostot (*)</translation>
     </message>
@@ -13624,7 +14743,7 @@ Haluatko tallentaa viestin luonnoslaatikkoon?</translation>
         <translation>Vie PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Viestiä ei ole lähetetty.
@@ -13646,7 +14765,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lisää ylimääräinen tiedosto</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Hei,&lt;br&gt;haluan olla ystäväsi Retrosharessa.&lt;br&gt;</translation>
     </message>
@@ -13670,24 +14789,28 @@ Haluatko tallentaa viestin?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">Sinulle on ystäväkutsu</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Vastaa nyt:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Lähettäjä:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>Ystäväsolmut</translation>
     </message>
@@ -13732,13 +14855,13 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Kiitos, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Etäinen henkilöllisyys:</translation>
     </message>
@@ -13748,12 +14871,12 @@ Haluatko tallentaa viestin?</translation>
         <translation>[Puuttuva]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Ole hyvä ja luo henkilöllisyys allekirjoittaaksesi etäiset viestit, tai poista etäiset vertaiset kohdeluttelosta.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Solmun nimi &amp; tunniste:</translation>
     </message>
@@ -13831,7 +14954,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Oletus</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Uudessa välilehdessä</translation>
     </message>
@@ -13841,7 +14964,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Uudessa ikkunassa</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Muokkaa merkkausta</translation>
     </message>
@@ -13864,7 +14987,7 @@ Haluatko tallentaa viestin?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Aih:</translation>
     </message>
@@ -13872,7 +14995,7 @@ Haluatko tallentaa viestin?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Viesti</translation>
     </message>
@@ -13900,7 +15023,7 @@ Haluatko tallentaa viestin?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Suositellut tiedostot</translation>
     </message>
@@ -13910,37 +15033,37 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lataa kaikki suositellut tiedostot</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Aihe:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Lähettäjä:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Vastaanottaja:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Kopio:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Piilokopio:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Merkkaukset:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Vastaa</translation>
     </message>
@@ -13980,7 +15103,7 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>Lähetä kutsu</translation>
     </message>
@@ -14024,7 +15147,7 @@ Haluatko tallentaa viestin?</translation>
         <location line="+5"/>
         <location line="+3"/>
         <source>Buttons Text Beside Icon</source>
-        <translation type="unfinished">Painikkeet tekstillä kuvakkeen vieressä</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -14032,7 +15155,7 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Hyväksy %1 ystäväksesi</translation>
     </message>
@@ -14042,12 +15165,12 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lisää %1 ystäväksi</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Ei aihetta</translation>
     </message>
@@ -14057,22 +15180,17 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lataa</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14082,23 +15200,21 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
+        <source>Send invite?</source>
+        <translation type="vanished">Lähetä kutsu?</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Haluatko todella lähettää kutsun varmenteellasi?</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Lataa kaikki</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Tulosta asiakirja</translation>
     </message>
@@ -14113,12 +15229,12 @@ Haluatko tallentaa viestin?</translation>
         <translation>HTML-tiedostot (*.htm *.html);;Kaikki tiedostot (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Lataa kuvat aina tämän viestin osalta</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Piilota liitteet-näkymä</translation>
     </message>
@@ -14140,6 +15256,42 @@ Haluatko tallentaa viestin?</translation>
         <source>Compose</source>
         <translation>Kirjoita</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Vastaa valittuun viestiin</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Vastaa</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Vastaa kaikkiin valittuihin viesteihin</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Vastaa kaikille</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Välitä valittu viesti</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Eteenpäin</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Poista valittu viesti</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Tuhoa</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Tulosta valittu viesti</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14218,7 +15370,7 @@ Haluatko tallentaa viestin?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Uusi viesti</translation>
     </message>
@@ -14228,16 +15380,60 @@ Haluatko tallentaa viestin?</translation>
         <translation>Kirjoita viesti</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Vastaa valittuun viestiin</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Vastaa</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Vastaa kaikkiin valittuihin viesteihin</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Vastaa kaikille</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Välitä valittu viesti</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Välitä</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Poista valittu viesti</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Tuhoa</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Tulosta valittu viesti</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Tulosta</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Näytä</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Merkkaukset</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Saapuneet</translation>
@@ -14267,17 +15463,21 @@ Haluatko tallentaa viestin?</translation>
         <translation>Roskat</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Saapuneet yhteensä:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Kansiot</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Pikanäkymä</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Tulosta...</translation>
@@ -14287,6 +15487,26 @@ Haluatko tallentaa viestin?</translation>
         <source>Print Preview</source>
         <translation>Tulostuksen esikatselu</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Painikkeet vain kuvakkeilla</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Painikkeet tekstillä kuvakkeiden vieressä</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Painikkeet tekstillä</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Painikkeet tekstillä kuvakkeiden alla</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Aseta teksti kuvakkeen alle</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14308,7 +15528,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Välitä viesti</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Aihe</translation>
     </message>
@@ -14318,7 +15538,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Lähettäjä</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Päiväys</translation>
     </message>
@@ -14328,7 +15548,39 @@ Haluatko tallentaa viestin?</translation>
         <translation>Sisältö</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Järjestä liitetiedostojen mukaan</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Järjestä otsikon mukaan</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Järjestä luettujen mukaan</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Järjestä lähettäjän mukaan</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Järjestä ajan mukaan</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Järjestä merkkausten mukaan</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Järjestä tähtien mukaan</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Välitä valittu viesti</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Hae aihetta</translation>
     </message>
@@ -14337,11 +15589,6 @@ Haluatko tallentaa viestin?</translation>
         <source>Search From</source>
         <translation>Hae lähettäjää</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14368,14 +15615,14 @@ Haluatko tallentaa viestin?</translation>
         <translation>Hae liitetiedostoja</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Viestit&lt;/h1&gt;                          &lt;p&gt;Retrosharella on sen oma sisäinen sähköpostijärjestelmä. Voit lähettää/vastaanottaa sähköposteja yhdistetyiltä ystäväsolmuilta.&lt;/p&gt;  &lt;p&gt;On myös mahdollista lähettää viestejä muiden ihmisten henkilöllisyyksiin käyttäen yleisreititinjärjestelmää. Nämä viestit     ovat aina salattuja ja allekirjoitettuja, ja ne välitetään välissä olevien solmujen kautta, kunnes ne saavuttavat lopullisen kohteensa. &lt;/p&gt;    &lt;p&gt;Etäiset viestit säilyvät sinun Lähtevissä kunnes vastaanottotodistus on saatu.&lt;/p&gt; &lt;p&gt;Yleisesti, sinä voit käyttää viestejä suositellaksesi tiedostoja ystävillesi liittäen tiedostolinkkejä,  tai suosittelemalla ystäväsolmuja muille ystäväsolmuille, täten vahvistaaksesi omaa verkkoasi, tai antaaksesi palautetta kanavan omistajalle.&lt;/p&gt;                    </translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Tähdelliset</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14449,7 +15696,7 @@ Haluatko tallentaa viestin?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14463,7 +15710,7 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14478,33 +15725,38 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Luonnokset</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Vastaanottaja</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Ei tähdellä merkittyjä viestejä. Tähtien avulla voit antaa viesteille erikoisaseman ja helpottaa löytämistä. Antaaksesi viestille tähden, paina vaaleanharmaata tähteä viestin vieressä.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Ei järjestelmäviestejä.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Vastaanottaja</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Järjestä vastaanottajan mukaan</translation>
+    </message>
+    <message>
+        <source>This message goes to a distant person.</source>
+        <translation type="vanished">Tämä viesti menee etäisellä henkilölle.</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14512,6 +15764,26 @@ Haluatko tallentaa viestin?</translation>
         <source>Total:</source>
         <translation>Yhteensä:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Viestit</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Järjestä allekirjoituksen mukaan</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Tämä viesti on allekirjoitettu ja allekirjoitus täsmää</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Tämä viesti on allekirjoitettu, mutta allekirjoitus ei täsmää</translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">Tämä viesti tulee etäiseltä henkilöltä.</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14539,17 +15811,7 @@ Haluatko tallentaa viestin?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">Tallenna kuva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Liitä muokkaamattomana tekstinä</translation>
     </message>
@@ -14603,7 +15865,7 @@ Haluatko tallentaa viestin?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -14613,7 +15875,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Poista kohde</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished">alkaen</translation>
     </message>
@@ -14648,10 +15910,18 @@ Haluatko tallentaa viestin?</translation>
         <translation>Odottava viesti</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
+    <message>
+        <source>Send invite?</source>
+        <translation type="vanished">Lähetä kutsu?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Haluatko todella lähettää kutsun varmenteellasi?</translation>
+    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -14789,7 +16059,7 @@ Haluatko tallentaa viestin?</translation>
         <translation>Vertaisen tunniste</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Poista käyttämättömät avaimet...</translation>
     </message>
@@ -14799,7 +16069,7 @@ Haluatko tallentaa viestin?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Tyhjennä avainnippu</translation>
     </message>
@@ -14817,13 +16087,7 @@ Huom.: vanha avainnippusi varmuuskopioidaan.
 Poisto voi epäonnistua, jos koneessasi on käynnissä useita Retroshareja samanaikaisesti.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Avainnipun tiedot</translation>
@@ -14858,13 +16122,18 @@ Avainippusi varmuuskopioitiin tiedostoon ennen poistoa.
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Tietojen epäjohdonmukaisuus avainnipussa. Tämä on todennäköisesti ohjelmointivirhe. Ota yhteyttä kehittäjiin.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>Vie/luo uusi solmu</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Luotetut avaimet ainoastaan</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Hae nimeä</translation>
     </message>
@@ -14874,12 +16143,12 @@ Avainippusi varmuuskopioitiin tiedostoon ennen poistoa.
         <translation>Hae vertaisen tunnistetta</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>Profiilin tiedot...</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14888,6 +16157,13 @@ Reported error:</source>
 Raportoitu virhe:</translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Verkko</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14914,7 +16190,7 @@ Raportoitu virhe:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14935,7 +16211,7 @@ Raportoitu virhe:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Ryhmät</translation>
     </message>
@@ -14965,19 +16241,19 @@ Raportoitu virhe:</translation>
         <translation type="unfinished">tuo ystäväluettelo mukaan lukien ryhmät</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">Haku</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">Tunniste</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14987,12 +16263,12 @@ Raportoitu virhe:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished">Näytä kohteet</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15002,7 +16278,7 @@ Raportoitu virhe:</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Ryhmä</translation>
     </message>
@@ -15117,7 +16393,7 @@ Raportoitu virhe:</translation>
         <translation type="unfinished">Kutista kaikki</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Haluatko poistaa tämän solmun?</translation>
     </message>
@@ -15127,7 +16403,7 @@ Raportoitu virhe:</translation>
         <translation type="unfinished">Haluatko poistaa tämän ystävän?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Valmis!</translation>
@@ -15241,7 +16517,11 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">Lokimerkinnät</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15256,7 +16536,11 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Poista kaikki</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">This is a test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>Uusin ylimmäisenä</translation>
     </message>
@@ -15266,12 +16550,20 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Vanhin ylimmäisenä</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Uutissyöte&lt;/h1&gt;                                                             &lt;p&gt;Lokisyöte näyttää uusimmat tapahtumat verkostossasi vastaanottohetken mukaan järjestettynä.                    Näin saat yhteenvedon ystäviesi toiminnasta.                                                          Voit määrittää näytettävät tapahtumat &lt;b&gt;Asetuksista&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;Näytettäviä tapahtumia:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Yhteydenottoyritykset (hyödyllisiä ystävien hankkimiseen ja yhteydenottojen hallintaan)&lt;/li&gt;    &lt;li&gt;Viestit kanaville ja foorumeille&lt;/li&gt;                                                                               &lt;li&gt;Uudet kanavat ja foorumit, jotka ovat tilattavissasi&lt;/li&gt;                                                          &lt;li&gt;Yksityisviestit ystäviltäsi&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="vanished">Loki</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15326,6 +16618,10 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Blogs</source>
         <translation>Blogit</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Turvallisuus</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15347,6 +16643,10 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Message</source>
         <translation>Viesti</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Yhteydenottoyritys</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15363,6 +16663,10 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Ip security</source>
         <translation>IP-tietoturva</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">Loki</translation>
+    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -15373,6 +16677,10 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Circles</source>
         <translation>Piirit</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Linkit</translation>
+    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -15425,6 +16733,14 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Chat rooms</source>
         <translation>Keskusteluhuoneet</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">Keskusteluhuoneet</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="vanished">Huomioi kirjainkoko</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15500,16 +16816,24 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Estä väliaikaisesti kaikki ponnahdusviestit</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Syöte</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Ilmaisinalue</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">Laske lukemattomat viestit</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation>Salasana vaadittu</translation>
     </message>
@@ -15529,12 +16853,12 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Väärä salasana!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Anna Retroshare salasanasi:</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Rekisteröimätön lisäosa/suoritettava tiedosto</translation>
     </message>
@@ -15549,7 +16873,19 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <translation>Tarkista järjestelmän kello.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Tarkastellaan jaettuja tiedostoja...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Luodaan tiivistettä (hash) tiedostolle</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Tallennetaan tiedostoluetteloa...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15560,19 +16896,17 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Tuntematon otsikko</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Salattu viesti</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Keskusteluaulojen toiminnan varmistamiseksi tietokoneesi ajan on oltava oikeassa. Tarkista, että näin on (mahdollinen useiden minuuttien aikasiirtymä havaittiin ystävilläsi). </translation>
     </message>
@@ -15580,7 +16914,7 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Ystävä linjoilla</translation>
     </message>
@@ -15632,6 +16966,10 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Ikkuna</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15697,6 +17035,10 @@ ainakin yksi vertainen jäi lisäämättä ryhmään</translation>
         <source>This profile has signed your own profile key</source>
         <translation>Tämä profiili on allekirjoitettu sinun profiiliavaimellasi</translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Avain allekirjoitukset:</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15726,20 +17068,23 @@ p, li { white-space: pre-wrap; }
         <translation>PGP-avain</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation>Nämä vaihtoehdot koskevat kaikkia solmuja profiilissa:</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Ystäväsi avaimen allekirjoittamisella ilmaiset luottamuksesi tähän ystävään muille ystävillesi. Se auttaa heitä päättämään salliako yhteydet siitä avaimesta perustuen sinun omaan luottamukseen. Avaimen allekirjoittaminen on täysin vapaaehtoista, eikä sitä voi perua, joten tee niin harkiten.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Allekirjoita PGP-avain</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15776,7 +17121,12 @@ p, li { white-space: pre-wrap; }
         <translation>Sisällytä allekirjoitukset</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Asetukset</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare käy ajoittain läpi ystäväluettelosi siirtojasi vastaavien selattavien tiedostojen varalta, jotta voitaisiin muodostaa suora siirtoyhteys. Tällaisessa tapauksessa ystäväsi tietää, että lataat tiedostoa.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Estääksesi toiminnan tämän ystävän tapauksessa, poista rasti tästä ruudusta. Voit silti muodostaa suoran siirtoyhteyden halutessasi, esim. lataamalla suoraan ystäväsi tiedostoluettelosta. Tätä asetusta sovelletaan kaikkiin saman solmun sijainteihin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -15790,6 +17140,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä asetus sallii automaattisen suositellun tiedoston latauksen viestistä, joka saapuu tästä solmusta. Tätä voidaan esimerkiksi käyttää tiedostojen lähettämiseen omien solmujesi kesken. Sovelletaan kaikkiin sijainteihin samasta solmusta.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15822,21 +17176,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Virhe haettaessa vertaisen tietoja.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Retroshare ei tue antamaasi avainalgoritmia
@@ -15857,7 +17211,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla Ei.</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Luottamustaso ilmaisee omaa luottamustasi tähän avaimeen. Ohjelma ei käytä sitä eikä sitä jaeta, mutta se voi olla hyödyllinen hyvien sekä huonojen avainten muistamiseen.</translation>
     </message>
@@ -15926,6 +17280,10 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Salasana saattaa olla väärin</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15933,12 +17291,12 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>Retroshare-profiili</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Tämä on sinun oma PGP-avain ja sen on allekirjoittanut:</translation>
     </message>
@@ -15964,7 +17322,7 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Keskustelu</translation>
     </message>
@@ -15985,7 +17343,7 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <translation>Poista kohde</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
@@ -16025,7 +17383,7 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <translation>Aikaero:</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Kirjoita viesti</translation>
     </message>
@@ -16039,6 +17397,10 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>Friend Connected</source>
         <translation>Ystävä yhdistyneenä</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Yhteydenottoyritys</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16077,13 +17439,17 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>Unknown</source>
         <translation type="unfinished">Tuntematon</translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Tuntematon vertainen</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Lähetä viesti</translation>
     </message>
@@ -16135,6 +17501,10 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>Chat with this person as...</source>
         <translation>Keskustelu henkilön kanssa...</translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">Lähetä viesti tälle henkilölle</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -16193,6 +17563,10 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
+        <translation type="vanished">anna automaattisesti &quot;Myönteinen&quot; mielipide yhteyshenkilöilleni</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -16250,6 +17624,13 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Poistettujen pannattujen tunnisteiden paluun estämiseksi, koska niitä käytetään esim. foorumeilla tai kanavilla, pannatut henkilöllisyydet pidetään luettelossa jonkin aikaa. Sen jälkeen ne &amp;quot;tyhjennetään&amp;quot; pannattujen luettelosta ja ladataan uudestaan pannattomiksi, jos niitä käytetään foorumeille, keskusteluhuoneissa jne.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Lomake</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16257,11 +17638,23 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Valokuva</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Kommentti</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Yhteenveto</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16322,6 +17715,14 @@ Varoitus: Tiedostonsiirto-asetuksissa estit Salli suora latauksen valitsemalla E
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Lisää kommentti</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Kirjoita kommentti...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16392,6 +17793,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Luo albumi</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Näytä albumi</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16413,17 +17818,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diaesitys</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Albumini</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Tilatut albumit</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Jaetut albumit</translation>
     </message>
@@ -16453,7 +17858,7 @@ yrität muokata sitä!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Albumin nimi</translation>
     </message>
@@ -16512,19 +17917,19 @@ yrität muokata sitä!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16560,12 +17965,12 @@ yrität muokata sitä!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>TekstiMerkki</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Näytä lisätietoja lisäosasta</translation>
     </message>
@@ -16711,6 +18116,56 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Lisäosien hakemistot</translation>
     </message>
+    <message>
+        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
+        <translation type="vanished">Lisäosa on estetty. Napsauta salli-painiketta ja käynnistä Retroshare uudestaan.</translation>
+    </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[estetty]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">API-numeroa ei annettu. Ole hyvä ja lue ohje lisäosien kehittämisestä.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[latausongelma]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">SVN-numeroa ei annettu. Ole hyvä ja lue ohje lisäosien kehittämisestä.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Virhe ladattaessa.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Puuttuva merkki. Väärä versio?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Ei lisäosaobjektia</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Lisäosat ladattu.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Tila tuntematon.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Rastita tämä lisäosien kehittämisen yhteydessä. Tiivistettä (hash)
+ei tällöin tarkasteta. Tavanomaisessa käytössä
+tiivisteen tarkistaminen suojelee sinua
+vahingoittamistarkoituksessa tehdyiltä lisäosilta.</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16780,27 +18235,12 @@ p, li { white-space: pre-wrap; }
         <translation>Aseta ikkuna päällimmäiseksi</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">Estä tämä henkilö (antaa kielteisen mielipiteen)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished">Anna neutraali mielipide</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished">Anna myönteinen mielipide</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16834,6 +18274,22 @@ p, li { white-space: pre-wrap; }
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The person you are talking to has deleted the secured chat tunnel.</source>
+        <translation type="vanished">Henkilö, jonka kanssa puhut on poistanut suojatun keskustelutunnelin.</translation>
+    </message>
+    <message>
+        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
+        <translation type="vanished">Keskustelukumppani on poistanut suojatun tunnelin, viestit toimitetaan mahdollisimman pian.</translation>
+    </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Tämän ikkunan sulkeminen lopettaa keskustelun, ilmoittaa vertaiselle ja poistaa salatun tunnelin.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Suljetaanko tunneli?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16853,7 +18309,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Uusi</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Äänestä ylös</translation>
     </message>
@@ -16873,8 +18329,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentit</translation>
     </message>
@@ -16899,13 +18355,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentti</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished">Kommentit</translation>
     </message>
@@ -16933,12 +18389,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Allekirjoitettu:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Huomiot</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
@@ -16953,22 +18417,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Lataa kuvatiedosto</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16984,17 +18438,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17004,7 +18448,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Lähetä viesti</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">Olet lähettämässä linkkiä. Lähettämässäsi linkissä tulisi mielellään olla mielenkiintoista sisältöä ja kuvaava otsikko.</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Lähetä</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Lähetä uusi viesti</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Ole hyvä ja lisää otsikko</translation>
     </message>
@@ -17024,22 +18484,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17054,7 +18504,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Lähetä</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17065,7 +18515,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Kuva</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17075,7 +18525,7 @@ p, li { white-space: pre-wrap; }
         <translation>Otsikko</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Linkki</translation>
     </message>
@@ -17083,12 +18533,44 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Lähetetyt linkit</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Lähetetyt&lt;/h1&gt;        &lt;p&gt;Lähetetyt-palvelu sallii sinun jakaa internet-linkkejä, jotka leviävät Retroshare-solmuihin kuten foorumeille ja 	 kanaville&lt;/p&gt; 	 &lt;p&gt;Tilaavat käyttäjät voivat kommentoida linkkejä. Edistämisjärjestelmä mahdollistaa  	 tärkeiden linkkien korostamisen.&lt;/p&gt;      &lt;p&gt;Linkkien jakamisessa ei ole mitään rajoituksia, joten ole siis varovainen niitä avatessasi.&lt;/p&gt;    &lt;p&gt;Lähetetyt linkit pidetään %1 päivän ajan, ja ajantasaistetaan viimeisten %2 päivän ajan, ellet muuta tätä.&lt;/p&gt;                </translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Luo aihe</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Aiheeni</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Tilatut viestiketjut</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Suositut viestiketjut</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Muut viestiketjut</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Linkit</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17122,7 +18604,31 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Lähetetyn Aihe</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Lisää viestiketjujen ylläpitäjiä</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Valitse viestiketjujen ylläpitäjiä</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Luo uusi aihe</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Muokkaa aihetta</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Päivitä aihe</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17160,17 +18666,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>Tilaa Lähetetyt</translation>
     </message>
@@ -17186,7 +18682,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -17201,17 +18697,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">Lähetetyn kuvaus</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Ladataan</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">Uudet Lähetetyt</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">Ei koskaan</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17224,18 +18727,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Sivusto</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Kommentit</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
@@ -17246,12 +18753,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Kommentti</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished">Kommentit</translation>
     </message>
@@ -17261,7 +18768,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Tämän viestin kirjoittaja (tunnisteella %1) on pannassa.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17271,17 +18778,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Äänestä ylös</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Äänestä alas</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Merkitse luetuksi ja poista kohde</translation>
     </message>
@@ -17291,7 +18802,7 @@ p, li { white-space: pre-wrap; }
         <translation>Uusi</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Uusi kommentti:</translation>
     </message>
@@ -17301,7 +18812,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kommentin arvo</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
     </message>
@@ -17342,10 +18853,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Ladataan</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Käyttäjältä</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Lomake</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Suosittu</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Uusi</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Ylimmäiseksi</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Tänään</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Eilen</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Tällä viikolla</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Tässä kuussa</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Tänä vuonna</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Lähetä uusi viesti</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Seur.</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">Retroshare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Luo tai valitse allekirjoitustunniste ennen äänestämistä</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Edellinen</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17365,17 +18943,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17385,15 +18953,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ylläpitäjä:</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">tuntematon</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished">Jakelu:</translation>
     </message>
@@ -17403,42 +18971,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">Viestejä</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17458,7 +19026,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Suosittu</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Haku</translation>
     </message>
@@ -17488,17 +19056,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17513,17 +19081,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Tyhjä</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopioi Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17533,31 +19096,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Muokkaa</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished">tietoa</translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17572,7 +19131,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Aloita tilaus</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">Ei koskaan</translation>
     </message>
@@ -17646,16 +19205,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Ei kanavaa valittuna</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17664,6 +19213,14 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Välilehdet</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Avaa jokainen aihe uuteen välilehteen</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Linkit</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17677,6 +19234,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Lähetetty</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17745,16 +19306,16 @@ p, li { white-space: pre-wrap; }
         <translation>Profiilin hallinta</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17866,7 +19427,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Muokkaa tilaviestiä</translation>
@@ -17882,7 +19443,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Profiilin hallinta</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Julkiset tiedot</translation>
     </message>
@@ -17917,12 +19478,12 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation>Linjoilla alkaen:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Muita tietoja</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Osoitteeni</translation>
     </message>
@@ -17966,27 +19527,51 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Lähettäjä</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Tili 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Tili 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Tili 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Lisää pulssiin</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">suodata</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">Linkin lisääjä</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Näytä muodossa</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17996,12 +19581,12 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished">Lähettäjä:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18031,13 +19616,13 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished">Kielteinen</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18049,22 +19634,12 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18073,13 +19648,17 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Lähetä pulssi lennättimeen</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18094,24 +19673,34 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Lataa kuvatiedosto</translation>
+        <source>From</source>
+        <translation type="vanished">Lähettäjä</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Päiväys</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18122,7 +19711,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished">Lomake</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18141,7 +19730,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18151,7 +19740,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18178,7 +19767,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18188,7 +19777,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18208,7 +19797,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18324,7 +19913,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18332,42 +19921,37 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18399,7 +19983,7 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18407,8 +19991,8 @@ ja käyttää &quot;Tuo&quot;-painiketta ladataksesi sen</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Vahvistus</translation>
     </message>
@@ -18679,12 +20263,12 @@ Merkit &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; korvataan merkillä
         <translation>Vertaisen tiedot</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Tiedostopyyntö peruttu</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Tämä Retrosharen versio käyttää OpenPGP-SDK:ta. Tämän takia se ei käytä järjestelmäjaettua PGP-avainketjua, vaan sillä on oma avainketjunsa jaettuna kaikkien käynnissä olevien Retrosharejen kanssa.&lt;br&gt;&lt;br&gt;Sinulla ei näytä olevan tällaista avainketjua, vaikka olemassaolevissa Retroshare-tileissä mainitaan PGP-avaimet. Tämä johtuu todennäköisesti siitä, että siirryit juuri ohjelman uudempaan versioon.</translation>
     </message>
@@ -18715,7 +20299,7 @@ Merkit &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; korvataan merkillä
         <translation>Odottamaton virhe. Ole hyvä ja raportoi &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18751,7 +20335,7 @@ The error reported is:&quot;</source>
         <translation>Piilotetun palvelun käynnistäminen ei ollut mahdollista.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Useita instansseja</translation>
@@ -18774,26 +20358,6 @@ Lukitustiedosto:
 Lukitustiedosto:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18814,6 +20378,14 @@ Lukitustiedosto:
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
+        <translation type="vanished">Tunneli odottaa...Viestit toimitetaan mahdollisimman pian</translation>
+    </message>
+    <message>
+        <source>Secured tunnel is working. Messages are delivered immediately!</source>
+        <translation type="vanished">Suojattu tunneli toimii. Viestit toimitetaan välittömästi!</translation>
+    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -18876,7 +20448,7 @@ Virhe:
         <translation>Datan lähetys</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Sinulla näyttäisi olevan solmuja kytkettynä DSA-avaimiin:</translation>
     </message>
@@ -18886,7 +20458,7 @@ Virhe:
         <translation>Retroshare ei tällä hetkellä tue DSA-avaimia. Et voi käyttää näitä solmuja. Olemme pahoillamme. </translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>käytössä</translation>
     </message>
@@ -18896,7 +20468,7 @@ Virhe:
         <translation>estetty</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Lisää IP %1 sallittujen luetteloon</translation>
     </message>
@@ -18912,7 +20484,7 @@ Virhe:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>%1 sekuntia sitten</translation>
     </message>
@@ -18980,7 +20552,7 @@ Security: no anonymous IDs</source>
 Tietoturva: ei nimettömiä tunnisteita</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation>Liity keskusteluhuoneeseen</translation>
     </message>
@@ -19008,7 +20580,7 @@ Tietoturva: ei nimettömiä tunnisteita</translation>
         <translation>XML-tiedoston jäsentäminen epäonnistui!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation>Toistaiseksi</translation>
     </message>
@@ -19188,29 +20760,13 @@ Tietoturva: ei nimettömiä tunnisteita</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Nimi</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Solmu</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished">Osoite</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Tila</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19403,6 +20959,10 @@ Tietoturva: ei nimettömiä tunnisteita</translation>
         <source>Click to resume the hashing process</source>
         <translation>Napsauta jatkaaksesi tiivisteen laskentaa</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Tämä varmenne sisältää:</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19453,18 +21013,6 @@ Tietoturva: ei nimettömiä tunnisteita</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19627,7 +21175,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Verkon laajuinen</translation>
     </message>
@@ -19810,7 +21358,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Upotettujen kuvien lataaminen on estetty.</translation>
     </message>
@@ -19823,7 +21371,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Sallittu oletuksena</translation>
     </message>
@@ -19996,22 +21544,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">Tallenna kuva</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20019,12 +21557,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20054,6 +21592,14 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">Näytä sarake...</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[ei otsikkoa]</translation>
+    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -20716,7 +22262,7 @@ Jos se on mielestäsi kunnollinen, poista mainittu rivi tiedostosta ja avaa se u
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nimi</translation>
@@ -20837,7 +22383,7 @@ Jos se on mielestäsi kunnollinen, poista mainittu rivi tiedostosta ja avaa se u
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Nimi</translation>
     </message>
@@ -20857,7 +22403,7 @@ Jos se on mielestäsi kunnollinen, poista mainittu rivi tiedostosta ja avaa se u
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20916,7 +22462,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished">Viesti tullaan välittämään ystävillesi.</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Muokattu viesti ... ]</translation>
     </message>
@@ -20930,6 +22476,11 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>[Unknown]</source>
         <translation type="unfinished">[Tuntematon]</translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Puuttuva viesti ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20943,11 +22494,6 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <source>From</source>
         <translation type="unfinished">Lähettäjä</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished">Vastaanottaja</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20970,18 +22516,13 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Järjestä luettujen mukaan</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Järjestä lähettäjän mukaan</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21004,9 +22545,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21027,7 +22566,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Palauttaa KAIKKI tallennetut Retrosharen asetukset.</translation>
     </message>
@@ -21088,7 +22627,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Asettaa Retrosharen kielen.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Lokitiedoston &apos;%1&apos;: %2 avaaminen epäonnistui</translation>
     </message>
@@ -21109,7 +22648,11 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Datahakemistoa ei voitu luoda: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Tarkistus</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation>käyttötapa</translation>
     </message>
@@ -21139,7 +22682,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Retrosharen graafisen käyttöliittymän käyttötiedot</translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>Virheellinen kielikoodi määritelty:</translation>
     </message>
@@ -21157,7 +22700,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Rekisterin käyttövirhe. Tarvitset ehkä Järjestelmänvalvojan oikeudet.</translation>
@@ -21174,12 +22717,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Anna hakusana (vähintään 3 merkkiä)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Aloita haku</translation>
     </message>
@@ -21241,7 +22784,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Tyhjennä</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Hakusanat</translation>
     </message>
@@ -21256,7 +22799,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Hakutunniste</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Tiedostonimi</translation>
     </message>
@@ -21356,23 +22899,23 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Lataa valitut</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Tiedoston nimi</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Lataa</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopioi Retroshare-linkki</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Lähetä Retroshare-linkki</translation>
     </message>
@@ -21382,7 +22925,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Lataushuomautus</translation>
     </message>
@@ -21419,7 +22962,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Poista kaikki</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Kansio</translation>
@@ -21430,17 +22973,17 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Uusi Retroshare-linkki/-linkit</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Avaa kansio</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Luo kokoelma...</translation>
     </message>
@@ -21460,7 +23003,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Lataa kokoelmatiedostosta...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Kokoelma</translation>
     </message>
@@ -21468,7 +23011,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Vertaisen tiedot</translation>
     </message>
@@ -21484,22 +23027,22 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Poista kohde</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>IP-osoite:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Vertaisen tunniste:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Sijainti:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Vertaisen nimi:</translation>
     </message>
@@ -21516,7 +23059,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation>mutta raportoitu:</translation>
     </message>
@@ -21541,8 +23084,8 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21550,7 +23093,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>haluaa olla ystäväsi Retrosharessa</translation>
     </message>
@@ -21581,7 +23124,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Laajenna</translation>
     </message>
@@ -21626,12 +23169,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Tila:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Kirjoita viesti</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Yhteydenottoyritys</translation>
     </message>
@@ -21651,22 +23194,17 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Tuntematon (lähtevä) yhteydenottoyritys</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Tuntematon tietoturvaongelma</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">Tuntematon</translation>
     </message>
@@ -21676,7 +23214,11 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Tuntematon vertainen</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
@@ -21686,7 +23228,7 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Haluatko poistaa tämän ystävän?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Varmenteella on väärä allekirjoitus! Vertainen ei ole se, joka hän väittää olevansa.</translation>
     </message>
@@ -21696,12 +23238,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Puuttuva/vioittunut SSL-varmenne. Ei todellinen Retrosharen käyttäjä.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>Varmenne aiheutti sisäisen virheen.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Vertainen/solmu ei ole ystäväluettelossa (PGP tunniste=</translation>
     </message>
@@ -21760,12 +23302,12 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Paikallinen osoite</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -21786,22 +23328,22 @@ estää viestin lähettämisen eteenpäin ystävillesi.</translation>
         <translation>Portti:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Paikallinen verkko</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Ulkoisen IP-osoitteen paikallistaminen</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Tunnetut / aiemmat IP:t:</translation>
     </message>
@@ -21817,16 +23359,21 @@ jättäminen päälle helpottaa yhteydenottoa, kun sinulla on
 vähän ystäviä. Tämä auttaa myös, jos olet palomuurin tai VPN:n takana.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Salli Retrosharen kysyä IP:täni näiltä verkkosivuilta:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Hyväksyttävä porttiavaruus on välillä 10-65535. Porttia 1024 pienemmät ovat yleensä järjestelmäsi käyttöön varattuja.</translation>
     </message>
@@ -21836,46 +23383,23 @@ vähän ystäviä. Tämä auttaa myös, jos olet palomuurin tai VPN:n takana.</t
         <translation>Hyväksyttävä porttiavaruus on välillä 10-65535. Porttia 1024 pienemmät ovat yleensä järjestelmäsi käyttöön varattuja.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Onion-osoite</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Etsintä käytössä (suositus)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>Tor on Retrosharen automaattisesti määrittelemä. Sinun ei pitäisi tarvita muuttaa mitään tässä.</translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Etsintä ei käytössä</translation>
     </message>
@@ -21885,7 +23409,7 @@ List of found external IP:
         <translation>Piilotettu - Katso asetukset</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>I2P-osoite</translation>
     </message>
@@ -21910,95 +23434,41 @@ List of found external IP:
         <translation>saapuva ok</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>Välityspalvelin näyttää toimivan.</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P-välityspalvelin ei ole käytössä</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
+        <translation>BOB on käynnissä ja saatavilla</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
-        <translation type="unfinished"></translation>
+        <source>BOB is not accessible! Is it running?</source>
+        <translation>BOB ei ole saatavilla! Onko se käynnissä?</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Retroshare käyttää BOB:a määrittääkseen %1 -tunnelin %2:%3 (nimetty %4)
+
+Kun muutat asetuksia (esim. porttia) käytä painikkeita alhaalla käynnistääksesi uudelleen BOB:n.
+
+</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation>asiakas</translation>
     </message>
@@ -22013,7 +23483,73 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation>BOB käsittelee pyyntöä</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation>yhteys tarkistus</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation>luodaan avainta</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation>käynnistyy</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation>suljetaan</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation>BOB käsittelee pyyntöä: %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation>BOB on rikki
+</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation>BOB virhe tapahtui:
+</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation>BOB-tunneli on käynnissä</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation>BOB toimii hyvin: tunneli toiminnassa</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation>BOB-tunneli ei ole käynnissä</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation>BOB on toimeton: tunneli suljettu</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation>pyydä uutta palvelin-avainta</translation>
     </message>
@@ -22023,7 +23559,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>lataa palvelin avain base64:sta</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation>pysäytä ensiksi BOB-tunneli luodaksesi uuden avaimen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation>pysäytä ensiksi BOB-tunneli ladataksesi avaimen</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation>pysäytä ensiksi BOB-tunneli kytkeäksesi BOB:n pois päältä</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Olet tavoitettavissa piilotetun palvelun kautta.</translation>
     </message>
@@ -22037,12 +23588,12 @@ Ovatko kaikki palvelut päällä ja käynnissä??
 Tarkista myös porttisi!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Piilotettu tila]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22052,7 +23603,7 @@ Tarkista myös porttisi!</translation>
         <translation>Tyhjennä</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>Latausraja (KB/s) </translation>
     </message>
@@ -22067,23 +23618,23 @@ Tarkista myös porttisi!</translation>
         <translation>Lähetysraja (KB/s) </translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lähetysrajoitus käsittää koko ohjelman. Liian alhainen rajoitus voi lopulta estää alhaisen prioriteetin palvelut (foorumit, kanavat) Suositeltu vähimmäisarvo on 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22100,7 +23651,17 @@ Kirjoita nyt osoite (esim. 127.0.0.1) ja portti, jonka valitsit aiemmin I2P-väl
 Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi normaali Solmu, miksi et määrittäisi Tor ja/tai I2P?</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation>Automaattinen I2P/BOB</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation>Salli I2P BOB - vaatii uudelleenkäynnistyksen toimiakseen</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation>sallii lisäasetukset</translation>
     </message>
@@ -22110,7 +23671,12 @@ Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi norm
         <translation>edistynyt tila</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation>I2P-instanssiosoite</translation>
     </message>
@@ -22120,7 +23686,17 @@ Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi norm
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation>I2P-välityspalvelinportti</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation>BOB saatavissa</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation>Osoite</translation>
     </message>
@@ -22160,7 +23736,7 @@ Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi norm
         <translation>lataa avain</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation>Käynnistä</translation>
     </message>
@@ -22175,7 +23751,12 @@ Voit nyt yhdistää Piilotettuihin solmuihin, ja vaikka käytössäsi olisi norm
         <translation>Pysäytä</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation>BOB-tila</translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation>Saapuva</translation>
     </message>
@@ -22222,32 +23803,7 @@ Lopuksi varmista, että portit vastaavat asetuksia.
 Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokisi..</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation>Välitys</translation>
     </message>
@@ -22302,7 +23858,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Yhteensä:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22327,7 +23883,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Poista palvelin</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22341,7 +23897,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>IP-suodattimet</translation>
     </message>
@@ -22364,7 +23920,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
@@ -22424,28 +23980,17 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Lisää sallittujen luetteloon</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Piilotetun palvelun asetukset</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä on Tor SOCKS-välityspalvelimen portti. Retroshare-solmusi voi käyttää tätä porttia yhdistääkseen&lt;/p&gt;&lt;p&gt;Piilotettuihin solmuihin. Tämä valo oikealla muuttuu vihreäksi, kun portti on käytössä tietokoneellasi. &lt;/p&gt;&lt;p&gt;Tämä ei kuitenkaan tarkoita sitä, että Retroshare-liikenteesi siirtyy Tor:n kautta. Näin tapahtuu ainoastaan, jos &lt;/p&gt;&lt;p&gt;sinä itse yhdistät Piilotettuihin solmuihin, tai käytät Piilotettua solmua itse.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22461,18 +24006,18 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P lähtevä ok</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Palvelun osoite</translation>
     </message>
@@ -22507,12 +24052,12 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Täytä palveluosoite</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>IP-avaruus</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>DHT raportoi IP:n naamioinnista</translation>
     </message>
@@ -22535,22 +24080,22 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Sinun lisäämäsi</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sallitut IP:t kerätään seuraavista lähteistä: käsin vaihdettuihin varmenteisiin sisältyvät IP:t, tässä ikkunassa lisäämäsi tai tietoturvasyötteen nimikkeistä poimimasi IP-alueet.&lt;/p&gt;&lt;p&gt;Oletuksena Retroshare (1) sallii aina yhteyden sallittujen luettelossa oleviin vertaisiin, myös IP-osoitteen ollessa estettyjen luettelossa; (2) valinnaisesti vaatii, että IP:t sisältyvät sallittujen luetteloon. Voit muuttaa toimintaa vertaiskohtaisesti jokaisen Retroshare-solmun &amp;quot;Tiedot&amp;quot;-ikkunassa.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT sallii sinun vastata ystäviesi yhteyspyyntöihin käyttäen BitTorrentin DHT:tä. Se parantaa yhteydenpitoa huomattavasti. DHT:lle ei kuitenkaan tallenneta mitään tietoa. Sitä käytetään ainoastaan välityspalvelin-järjestelmänä yhteydenmuodostamisessa muihin Retroshare-solmuihin.&lt;/p&gt;&lt;p&gt;Etsintä-palvelu lähettää solmun nimen ja luotetuttujen kontaktien tunnisteet yhdistetyille vertaisille, auttaen heitä valitsemaan uusia ystäviä. Ystävyys ei kuitenkaan ole milloinkaan automaattista ja molempien vertaisten pitää luottaa toisiinsa salliakseen yhteyden. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tämä tilailmaisin muuttuu vihreäksi heti, kun Retroshare onnistuu saamaan sinun oman IP:si alla olevilta verkkosivuilta, jos olet sallinut sen toiminnon. Retroshare yrittää myös saada muilla tavoin selville oman IP:si.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Luettelo täyttyy automaattisesti useista lähteistä kerätyn tiedon perusteella: DHT:n raportoimat naamioituneet vertaiset, ystäviesi raportoimat ja itse antamasi IP-avaruudet.&lt;/p&gt;&lt;p&gt;Naamioituneiden IP-osoitteiden automaattinen arvaaminen saattaa viedä ystäväsi estettyjen luetteloon. Tällaisissa tapauksissa voit käyttää pikavalikkoa lisätäksesi heidät sallittuihin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22585,22 +24130,26 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Automaattisesti aseta pannaan DHT:n naamioivat IP:t alkaen</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Määritä Tor and I2P SOCKS-välityspalvelin tässä. &lt;br/&gt;Jos käytät mieluummin BOB:a automaattisesti hallitaksesi I2P tarkista toinen välilehti.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Tor SOCKS-välityspalvelin</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor lähtevä ok</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor-välityspalvelin ei ole käytössä</translation>
     </message>
@@ -22680,7 +24229,7 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>rastita vertaiset, joiden kanssa haluat jakaa yksityisen julkaisuavaimesi</translation>
     </message>
@@ -22690,12 +24239,12 @@ Jos sinulla on ongelmia yhteydenluonnissa Tor-verkkoon, tarkista myös Tor-lokis
         <translation>Jaa ystävälle</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Jaa</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22714,7 +24263,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Jaettujen kansioiden hallinta</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation>Jaettu hakemisto</translation>
     </message>
@@ -22734,17 +24283,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Näkyvyys</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation>Lisää uusi</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Lisää jaettava hakemisto</translation>
     </message>
@@ -22754,7 +24303,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Käytä ja sulje</translation>
     </message>
@@ -22845,7 +24394,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Hakemistoa ei löydy tai nimeä ei hyväksytty.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Tämä on luettelo jaetuista kansioista. Voit lisätä ja poistaa kansioita alareunan painikkeiden avulla. Kun lisäät uuden kansion, aluksi kaikki kyseisen kansion tiedostot jaetaan. Voit erikseen määritellä jakomerkkejä kullekin jaetulle kansiolle.</translation>
     </message>
@@ -22853,7 +24402,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Tiedostot</translation>
     </message>
@@ -22904,16 +24453,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>tarkista tiedostot</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Lataa valitut</translation>
     </message>
@@ -22923,7 +24467,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Lataa</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Kopioi Retroshare-linkit leikepöydälle</translation>
     </message>
@@ -22938,7 +24482,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Lähetä Retroshare-linkit</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation>Jotkin tiedostot on jätetty pois</translation>
     </message>
@@ -22954,7 +24498,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Suositukset</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Luo kokoelma...</translation>
     </message>
@@ -22979,7 +24523,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Lataa kokoelmatiedostosta...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Jotkin tiedostot on jätetty pois koska niitä ei ole luetteloitu vielä.</translation>
     </message>
@@ -23122,12 +24666,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Avataan asetuksia</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Luodaan käyttöliittymää</translation>
     </message>
@@ -23151,7 +24695,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Tallenna salasana</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Kirjaudu sisään</translation>
     </message>
@@ -23496,7 +25040,7 @@ This choice can be reverted in settings.</source>
         <translation>Tilaviesti</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Viesti:</translation>
     </message>
@@ -23741,7 +25285,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Poista kaikki merkkaukset</translation>
     </message>
@@ -23777,15 +25321,12 @@ p, li { white-space: pre-wrap; }
         <translation>Muodostetaan Tor-yhteys...</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation>Tor-tila:</translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation>Tuntematon</translation>
     </message>
@@ -23795,13 +25336,18 @@ p, li { white-space: pre-wrap; }
         <translation>Ei käynnistynyt</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
+        <translation>Piilotetun palvelun osoite:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation>Ei asetettu</translation>
     </message>
@@ -23811,57 +25357,12 @@ p, li { white-space: pre-wrap; }
         <translation>Onion-osoite:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Virhe</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Ei yhteyttä</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation>[Odotetaan Tor...]</translation>
     </message>
@@ -23869,17 +25370,21 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Tämä Retrosharen versio käyttää Tor-verkkoa yhdistääkseen ystäviisi.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation>Tor ei ole nyt linjoilla</translation>
     </message>
@@ -23890,12 +25395,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Ei tor-asetuksia</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23923,7 +25427,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Siirtoasetukset</translation>
@@ -23934,7 +25438,7 @@ p, li { white-space: pre-wrap; }
         <translation>Samanaikaisten latausten maksimimäärä:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation>Jaetut hakemistot</translation>
     </message>
@@ -23944,27 +25448,22 @@ p, li { white-space: pre-wrap; }
         <translation>Jaa saapuvien hakemisto automaattisesti (suositeltavaa)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation>Muokkaa jakoa</translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation>Tarkista jaetut hakemistot automaattisesti joka</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation>minuutti</translation>
     </message>
@@ -24049,7 +25548,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24058,12 +25557,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Enimmäislähetykset ystävää kohden (0 = ei rajaa)</translation>
     </message>
@@ -24088,12 +25582,7 @@ p, li { white-space: pre-wrap; }
         <translation>Salli suora lataaminen:</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Suoratoisto</translation>
     </message>
@@ -24152,13 +25641,38 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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;Retroshare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; kykenee siirtämään dataa ja etsimään hakuja vertaisten välillä, jotka eivät välttämättä ole ystäviä. Tämä liikenne kaikesta huolimatta kauttakulkee ainoastaan yhdistettynä ystäväluettelelossa olevien kautta ja on nimetöntä.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;Sinä voit erikseen asettaa jakoilmaisimia jokaiselle jaetulle hakemistolle Jaetut tiedostot-ikkunassa:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Ystävien selattavissa&lt;/span&gt;: tiedostot, jotka näkyvät ystäville.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Nimettömästi jaetut&lt;/span&gt;: tiedostot, jotka ovat nimettömästi saatavissa etäisten F2F-tunneleitten kautta.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Välitettyjen tunnelipyyntöjen maksimimäärä per sekunti:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare keskeyttää kaikki siirrot ja asetustiedoston tallennukset, jos levytila menee alle tämän rajoituksen. Se estää tiedon häviämisen joissakin järjestelmissä. Ponnahdusikkuna varoittaa sinua, kun näin käy.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24168,17 +25682,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Varoitus</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation>Aseta saapuvien hakemisto</translation>
     </message>
@@ -24206,7 +25710,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Lataus suoritettu</translation>
     </message>
@@ -24230,23 +25734,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Sinulla on %1 kpl valmiita latauksia</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Sinulla on %1 valmis lataus</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 kpl valmiita latauksia</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 valmis lataus</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Lataukset</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Lähetykset</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nimi</translation>
@@ -24453,12 +25973,7 @@ p, li { white-space: pre-wrap; }
         <translation>Määritä...</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Siirrä jonossa...</translation>
     </message>
@@ -24483,7 +25998,7 @@ p, li { white-space: pre-wrap; }
         <translation>Valitse hakemisto</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Nimetön päästä-päähän salattu tunneli 0x</translation>
     </message>
@@ -24504,7 +26019,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24537,17 +26052,7 @@ p, li { white-space: pre-wrap; }
         <translation>Tiedosto %1 ei ole valmis. Jos se on mediatiedosto, voit yrittää esikatsella sitä.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Varoitus</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Muuta tiedostonimeä</translation>
     </message>
@@ -24562,7 +26067,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kirjoita uusi ja validi tiedostonimi</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Laajenna kaikki</translation>
@@ -24689,18 +26194,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Sarakkeet</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Tiedostojen siirrot</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Polku</translation>
     </message>
@@ -24710,7 +26220,7 @@ p, li { white-space: pre-wrap; }
         <translation>Näytä Polku-sarake</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>Esikatselutiedostoa ei voitu poistaa</translation>
     </message>
@@ -24720,7 +26230,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yritä uudelleen?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Luo kokoelma...</translation>
     </message>
@@ -24735,7 +26245,7 @@ p, li { white-space: pre-wrap; }
         <translation>Näytä kokoelma...</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Kokoelma</translation>
     </message>
@@ -24745,7 +26255,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 tunnelia</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Nimetön tunneli 0x</translation>
     </message>
@@ -24966,6 +26476,10 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">Nimettömiä tunneleita</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25159,17 +26673,12 @@ p, li { white-space: pre-wrap; }
         <translation>Lomake</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Salli Retroshare-verkkokäyttöliittymä</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Tila:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Verkkoparametrit</translation>
     </message>
@@ -25203,33 +26712,35 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port:</source>
+        <translation type="vanished">Portti:</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation>Salli pääsy kaikista IP-osoitteista (Oletus: sisäinen verkkoliityntä ainoastaan)</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <source>Apply setting and start browser</source>
+        <translation type="vanished">Käytä asetusta ja käynnistä selain</translation>
+    </message>
+    <message>
+        <source>Note: these settings do not affect retroshare-nogui. Retroshare-nogui has a command line switch to activate the web interface.</source>
+        <translation type="vanished">Huomautus: nämä asetukset eivät vaikuta retroshare-nogui:n. Retroshare-nogui:ssa on komentorivivalitsin verkkokäyttöliittymän aktivoimiseksi.</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Verkkokäyttöliittymä&lt;/h1&gt;       &lt;p&gt;Verkkokäyttöliittymä sallii sinun hallita Retrosharea selaimestasi. Lukuisat laitteet voivat jakaa yhden Retroshare-instanssin hallinnan. Voit aloittaa keskustelun tabletillasi ja myöhemmin käyttää pöytäkonetta sitä jatkaaksesi.&lt;/p&gt;     &lt;p&gt;Varoitus: älä paljasta verkkokäyttöliittymää internetille, sillä siihen ei ole mitään käytönhallintaa eikä salausta. Jos haluat käyttää verkkokäyttöliittymää internetin kautta, käytä SSH-tunnelia tai välityspalvelinta yhteyden suojaamiseen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>Verkkokäyttöliittymä ei ole käytössä</translation>
     </message>
@@ -25239,12 +26750,12 @@ p, li { white-space: pre-wrap; }
         <translation>Verkkokäyttöliittymä ei ole käytössä. Salli se Asetukset -&gt; Verkkokäyttöliittymä.</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>verkkokäyttöliittymän käynnistys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Verkkokäyttöliittymä</translation>
     </message>
@@ -25381,7 +26892,11 @@ p, li { white-space: pre-wrap; }
         <translation>Wikisivut</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Uusi ryhmä</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Sivun nimi</translation>
     </message>
@@ -25396,7 +26911,7 @@ p, li { white-space: pre-wrap; }
         <translation>Alkup. tunniste</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25484,7 +26999,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Muokkaushistoria</translation>
     </message>
@@ -25519,7 +27034,7 @@ p, li { white-space: pre-wrap; }
         <translation>PageId</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25549,18 +27064,14 @@ p, li { white-space: pre-wrap; }
         <translation>Merkkaukset</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Historia</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Näytä muokkaushistoria</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
@@ -25581,7 +27092,7 @@ p, li { white-space: pre-wrap; }
         <translation>Palauta</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Lähetä</translation>
     </message>
@@ -25653,6 +27164,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">Aikaväli</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25664,7 +27179,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Päivitä</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25679,7 +27203,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Muut</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25699,7 +27223,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25729,17 +27253,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Viime kuussa</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Viime viikolla</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Tänään</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Uusi</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">alkaen</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">päättyen</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Haku/suodatus</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Verkon laajuinen</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Hallitse tilejä</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Näyttää:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Sinä itse</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Ystävät</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Seurataan</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Räätälöity</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Tili 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Tili 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Tili 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">Valintaruutu</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Lähetä pulssi lennättimeen</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">Retroshare</translation>
@@ -25802,42 +27394,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Lomake</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Poista</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Sijainti:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25882,41 +27467,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">Ei sovellu</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Seurataan</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Tuntematon</translation>
@@ -25994,7 +27549,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2d</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26027,11 +27582,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Kuvat (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation>Hyväksytkö tämän profiilin allekirjoittamat yhteydet?</translation>
     </message>
@@ -26040,6 +27599,10 @@ p, li { white-space: pre-wrap; }
         <source>Name of the profile</source>
         <translation>Profiilin nimi</translation>
     </message>
+    <message>
+        <source>This column indicates trust level and whether you signed the profile PGP key</source>
+        <translation type="vanished">Tämä sarake osoittaa luottamustason ja mikäli olet allekirjoittanut profiilin PGP-avaimen.</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
@@ -26150,6 +27713,10 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> - </source>
+        <translation type="vanished"> - </translation>
+    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_fr.ts b/retroshare-gui/src/lang/retroshare_fr.ts
index 127c0fdd7..cc9597926 100644
--- a/retroshare-gui/src/lang/retroshare_fr.ts
+++ b/retroshare-gui/src/lang/retroshare_fr.ts
@@ -84,6 +84,13 @@
         <translation>Nœud caché seulement</translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Ajouter un commentaire</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>Retroshare : Recherche avancée</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Critère(s) de recherche</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Ajouter un critère de recherche.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Réinitialiser les critères de recherche.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Annuler la recherche.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Rechercher</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Créer un album </translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Nom de l&apos;album :</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Catégorie :</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Animaux</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Famille</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Amis</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Fleurs</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Vacances</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Paysages</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Animaux</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Portraits</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Voyage</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Travail</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Aléatoire</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Légende :</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Où :</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Photographe :</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Description :</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Options de partage</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Politique :</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Qualité :</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Commentaires :</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Identité :</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Public</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Limité</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Redimensionner les images (&lt; 1Mo)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Redimensionner les images (&lt; 10Mo)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Envoyer images originales</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Aucun commentaire admis</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Commentaires authentifiés</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Aucun commentaire admis</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Publier avec l&apos;identité</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Glissez &amp;amp; Déposez pour insérer des images. Cliquez sur une image pour modifier les détails ci-dessous.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Retour</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Ajouter photos</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Publier l&apos;album</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Album sans titre</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Donnez des détails sur cette album...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Où cela a été pris ?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Charger la miniature de l&apos;album</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Album</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Miniature de l&apos;album</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Résumé</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>Légende</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Où :</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Quand :</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Description :</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">options de partage</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Commentaires</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Publier l&apos;identité</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Visibilité</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Avertissements : Ces services sont expérimentaux. Aidez nous à les tester
@@ -569,6 +783,14 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">GxsForums</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">ChaînesGxs</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation>Photos</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">Sauvegarder image</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Ko</translation>
     </message>
@@ -633,13 +842,17 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Ajouter avatar</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Mettre votre image d&apos;avatar</translation>
     </message>
@@ -658,6 +871,10 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Charger l&apos;avatar</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation>Réinitialiser</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Vitesse de réception</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Vitesse d&apos;émission</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Toujours visible</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Style</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <source>% Opaque</source>
         <translation>% opaque</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Sauvegarder</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Annuler</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Statistiques enregistrées depuis :</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Masquer les options</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,7 +1063,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Commentaire</translation>
     </message>
@@ -852,12 +1093,12 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L&apos;auteur de ce message (avec l&apos;ID %1) est banni.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Voter pour</translation>
     </message>
@@ -885,7 +1126,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Voter pour</translation>
     </message>
@@ -943,7 +1184,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">Partager</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Changer l&apos;état de lecture du message</translation>
     </message>
@@ -983,7 +1224,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -991,12 +1232,12 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">J&apos;aime ça</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1042,12 +1283,12 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,17 +1457,17 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Chaînes</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
@@ -1236,17 +1477,11 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Téléchargements</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Charger les messages en tâche de fond (fils, &quot;threads&quot;)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Ouvrir chaque chaîne dans un nouvel onglet</translation>
     </message>
@@ -1254,7 +1489,7 @@ Mais rappelez-vous : Toutes les données *SERONT* perdus quand nous mettrons à
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1512,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">J&apos;aime ça</translation>
     </message>
@@ -1302,18 +1537,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1328,7 +1563,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -1338,7 +1573,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Commentaire</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished">Commentaires</translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Cacher</translation>
     </message>
@@ -1346,7 +1591,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
@@ -1537,7 +1782,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Afficher le salon de tchat</translation>
     </message>
@@ -1549,6 +1794,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>Tchats</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Vous avez %1 nouveaux messages</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Vous avez %1 nouveau message</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 nouveaux messages</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 nouveau message</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1570,14 +1831,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Salon inconnu</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Tout supprimer</translation>
     </message>
@@ -1585,13 +1845,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Participants</translation>
     </message>
@@ -1601,7 +1861,37 @@ into the image, so as to
         <translation>Sujet</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>Salons de tchat privés abonnés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>Salons de tchat publics abonnés</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Salons de tchat privés</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Salons de tchat publics</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Salons de tchat&lt;/h1&gt; &lt;p&gt;Les salons de tchat fonctionnent à peu près comme l&apos;IRC. Ils vous permettent de discuter anonymement avec de nombreuses personnes sans avoir besoin d&apos;être des amis.
+
+Un salon de tchat peut être de type public (vos amis le voient) ou privé (vos amis ne le voient pas, à moins que vous les invitiez avec &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). Une fois que vous aurez été invité à un salon privé, vous serez capable de le voir lorsque vos amis l&apos;utiliseront.
+
+La liste à gauche montre les salons de tchat auxquels vos amis participent. Vous pouvez soit :&lt;ul&gt; &lt;li&gt;Faire un clic droit pour créer un nouveau salon de tchat&lt;/li&gt; &lt;li&gt;Faire un double clic sur un salon pour y entrer, tchatter, et le montrer à vos amis&lt;/li&gt; &lt;/ul&gt; Note : pour que les salons de tchat fonctionnent correctement, votre ordinateur doit être à l&apos;heure. Alors vérifiez l&apos;horloge de votre système ! &lt;/p&gt; </translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Créer salon de tchat</translation>
     </message>
@@ -1611,7 +1901,7 @@ into the image, so as to
         <translation>Quitter ce salon</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Créer une identité non anonyme et entrer dans cette salle</translation>
     </message>
@@ -1670,12 +1960,12 @@ Sélectionnez un des salons de tchat à gauche pour en afficher les détails.
 Double-cliquez sur un salon pour y entrer et discuter.</translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 vous invite à un salon de tchat nommée %2</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Choisissez une identité anonyme pour de salon de tchat.</translation>
     </message>
@@ -1685,31 +1975,31 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Choisissez une identité pour ce salon :</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Créer un nouveau salon de tchat</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Sans sujet déterminé]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Info du salon sélectionné</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Privé</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Public</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>IDs anonymes acceptées</translation>
     </message>
@@ -1719,25 +2009,42 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Retirer des abonnements auto</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Ajouter aux abonnements auto</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Rechercher des salons de tchat</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Rechercher par nom</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Abonné</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Colonnes</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Oui</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Non</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1749,47 +2056,47 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Nom du salon de chat :</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>ID du salon de chat :</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Sujet : </translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Sécurité :</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Contacts :</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
@@ -1804,24 +2111,13 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Aucune IDs anonymes</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Montrer</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>colonn</translation>
@@ -1835,7 +2131,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Supprimer</translation>
     </message>
@@ -1880,22 +2176,46 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Tchat distant</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Tout le monde</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Contacts</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Personne</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Accepter un tchat éloigné et chiffré de la part de</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Paramètres du tchat</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Activer les émoticônes pour le tchat privé</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Activer les émoticônes pour le tchat public</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Activer les polices personnalisées</translation>
     </message>
@@ -1904,6 +2224,10 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Enable custom font size</source>
         <translation>Activer la taille de la police personnalisée</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Taille de police minimale</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1915,7 +2239,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Activer l&apos;italique</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1940,7 +2264,11 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Charger les images intégrées</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Salons de tchat</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Icône d&apos;onglet clignotant</translation>
     </message>
@@ -1949,6 +2277,10 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Do not send typing notifications</source>
         <translation>N&apos;envoyez pas de notifications de frappe</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Tchat privé</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1970,7 +2302,11 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Fenêtre/Icône d&apos;onglet clignotant</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Police d&apos;écriture</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Changer la police du tchat</translation>
     </message>
@@ -1980,10 +2316,14 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Police d&apos;écriture :</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Historique</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Style</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1998,13 +2338,17 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Variant:</source>
         <translation>Variante&#xa0;:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Tchat public</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Tchat privé</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation>Choisissez votre police de caractère par défaut pour les tchats.</translation>
     </message>
@@ -2068,28 +2412,22 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Dans cet onglet, vous pouvez configurer le nombre de messages de tchat que Retroshare gardera sauvegardé sur le disque et combien de la conversation précédente, elle affiche, pour les différents systèmes de discussions. La période de stockage max permet de supprimer les anciens messages et empêche l&apos;historique des conversations de remplir les tchats volatiles (par exemple, les salons de tchat et tchat à distance).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Salons de tchat</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Activé :</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2099,17 +2437,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Salons de tchat</translation>
@@ -2206,7 +2534,11 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Période maximale de stockage, en jours (0=garde tout) :</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Recherche préconfigurée</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Respecter la casse</translation>
     </message>
@@ -2245,6 +2577,10 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Threshold for automatic search</source>
         <translation>Seuil pour recherche automatique</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Identité par défaut pour les salons de tchat :</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2312,7 +2648,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Afficher le tchat</translation>
     </message>
@@ -2348,7 +2684,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
@@ -2383,12 +2719,12 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation>Italique</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>Insérer émoticône</translation>
     </message>
@@ -2468,6 +2804,11 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <source>Insert horizontal rule</source>
         <translation>Insérer ligne horizontale</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Sauvegarder image</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2505,7 +2846,7 @@ Double-cliquez sur un salon pour y entrer et discuter.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>écrit...</translation>
     </message>
@@ -2529,7 +2870,7 @@ après la conversion en HTML.</translation>
         <translation>Choisissez votre police de caractère.</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Etes-vous vraiment sûr de vouloir supprimer définitivement l&apos;historique ?</translation>
     </message>
@@ -2579,7 +2920,7 @@ après la conversion en HTML.</translation>
         <translation>est occupé et peut ne pas répondre</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Trouver en tenant compte de la casse</translation>
     </message>
@@ -2601,7 +2942,7 @@ après la conversion en HTML.</translation>
         <translation>Ne pas cesser de colorer après X articles trouvés (nécessite davantage de CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Trouver le précédent &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2616,12 +2957,16 @@ après la conversion en HTML.</translation>
         <translation>&lt;b&gt;Trouver &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Statut)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Régler police de caractères du texte et couleur</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Joindre un fichier</translation>
     </message>
@@ -2637,12 +2982,12 @@ après la conversion en HTML.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Marquer ce texte comme sélectionné&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation>Id d&apos;identité:</translation>
     </message>
@@ -2654,12 +2999,12 @@ Double click on it to add his name on text writer.</source>
 Double cliquez pour ajouter son nom dans le champ de saisie du message.</translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation>Non signé</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>articles trouvés.</translation>
     </message>
@@ -2679,7 +3024,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Saisissez votre message ici</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Ne pas cesser de colorer après</translation>
     </message>
@@ -2705,7 +3050,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Afficher les détails :</translation>
     </message>
@@ -2727,7 +3072,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Cercles personnels</translation>
     </message>
@@ -2753,7 +3098,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Amis</translation>
     </message>
@@ -2813,7 +3158,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Amis des Amis</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Cercles extérieurs (Admin)</translation>
     </message>
@@ -2829,7 +3174,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
@@ -2881,48 +3226,43 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Erreur : impossible d&apos;obtenir les détails de ce contact.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2934,7 +3274,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Chiffrement</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>Non connecté</translation>
     </message>
@@ -3016,17 +3356,25 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>aucun</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Ce certificat contient :</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;un &lt;b&gt;ID de noeud&lt;/b&gt; et &lt;b&gt;nom&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">une &lt;b&gt;adresse onion&lt;/b&gt; et &lt;b&gt;port&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">une &lt;b&gt;addresse IP&lt;/b&gt; et &lt;b&gt;port&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vous pouvez utiliser ce certificat pour vous faire de nouveaux amis. Envoyez-le par courrier électronique, ou donnez-le de main à la main.&lt;/p&gt;</translation>
     </message>
@@ -3041,7 +3389,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ceci est la méthode de chiffrement utilisée par &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. La connexion aux noeuds amis est &lt;/p&gt;&lt;p&gt;toujours lourdement chiffrée, et si la DHE est présente la connexion utilise ensuite &lt;/p&gt;&lt;p&gt;&amp;quot;perfect forward secrecy&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>avec</translation>
     </message>
@@ -3058,16 +3406,118 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <source>Connect Friend Wizard</source>
         <translation>Assistant de connexion à un ami</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Ajouter un nouvel ami</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">Vous avez un possédez le certificat de votre ami dans un &amp;Fichier</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">Devenir a&amp;mi avec les amis sélectionnés de vos amis</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Email 
+ (Your friend will receive an email with instructions how to download RetroShare)</source>
+        <translation type="vanished">&amp;Envoyer une invitation par Mail
+(Votre ami recevra un mail avec les instruction pour télécharger RetroShare)</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Inclure les signatures</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Copier votre certificat dans le presse-papier</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Enregistrer votre certificat dans un fichier</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Envoyer par courrier électronique</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Ouvrir le certificat de votre ami depuis un fichier</translation>
     </message>
+    <message>
+        <source>Open certificate</source>
+        <translation type="vanished">Ouvrir le certificat</translation>
+    </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">Veuillez coller le certificat de votre ami Retroshare dans la case ci-dessous</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Fichiers de certificats</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Utiliser des certificats PGP contenus dans des fichiers.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Importer le certificat d&apos;un ami...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Vous devez générer un fichier à partir de votre certificat et le transmettre à votre ami. Vous pouvez aussi utiliser un fichier généré auparavant.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Exporter mon certificat...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Glisser et déposer le certificat de votre ami dans cette fenêtre ou importez le à partir de votre disque dur</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Parcourir</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Amis de vos amis</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Veuillez selectionner avec qui vous souhaitez devenir ami.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Afficher :</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Devenir ami avec ces contacts</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>ID Retroshare</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Utilisez l&apos;ID Retroshare pour ajouter un ami qui est disponible dans votre réseau.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Ajouter l&apos;ID d&apos;amis Retroshare...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Coller l&apos;ID Retroshare d&apos;amis ci-dessous</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Entrez l&apos;ID Retroshare de votre ami, p. ex.. Contact@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3109,7 +3559,27 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Inviter un ami à rejoindre Retroshare par e-mail</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Entrez les adresses e-mail de vos amis (séparées par un point-virgule)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Destinataire(s) :</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Entrez l&apos;adresse e-mail de vos amis</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Sujet : </translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3125,32 +3595,77 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Détails de la demande</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Détails du contact</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">E-Mail :</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Noeud :</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">Veuillez noter que Retroshare nécessitera beaucoup de bande passante, mémoire et CPU si vous ajoutez de nombreux amis. Vous pouvez ajouter autant d&apos;amis que vous le souhaitez, mais avec avec plus de 40 cela nécessitera probablement trop de ressources.</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Emplacement :</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">Cet assistant vous aidera à vous connecter à vos amis avec Retroshare.&lt;br&gt;Il y a diverses possibilités pour le faire :</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Entrer manuellement le certificat</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">Entrer manuellement l&apos;ID Retroshare</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">Envoyez une invitation par me&amp;ssagerie électronique</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Recommander plusieurs amis les uns aux autres</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">Certificat Retroshare</translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">Veuillez coller ci-dessous le certificat de votre ami Retroshare</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Collez le certificat</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette boîte s&apos;attend au certificat de votre ami Retroshare. AVERTISSEMENT : cela est différent de la clé PGP de votre ami. Ne collez pas ici la clé de profil de votre ami (même pas une partie). Cela ne fonctionnera pas.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Ajouter l&apos;ami à un groupe :</translation>
     </message>
@@ -3160,7 +3675,7 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>Ami authentifié (clé PGP signée)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3185,22 +3700,16 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Ajouter cet ami pour communiquer avec lui</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Pour accepter la demande d&apos;amitié, cliquez sur le bouton Terminer.</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Désolé, des erreurs sont survenues</translation>
     </message>
@@ -3220,27 +3729,32 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
         <translation>À propos de votre ami : </translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Validité de la clé :</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Ils lui font aussi confiance :</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signer la clé d&apos;un ami est un moyen d&apos;exprimer votre confiance en cet ami, à vos autres amis. Les signatures sous cryptographie attestent que les propriétaires des clés répertoriées reconnaissent la clé PGP actuelle comme authentique.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Ce contact est déjà dans votre liste d&apos;am. L&apos;ajouter se limitera à enregistrer son adresse IP.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3286,17 +3800,49 @@ Double cliquez pour ajouter son nom dans le champ de saisie du message.</transla
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Le chargement du certificat à échoué</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Impossible d&apos;obtenir les détails de la clé PGP %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Tous les contacts dont vous n&apos;avez pas signé les certificats</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Amis de vos amis qui vous ont déjà accordé leur confiance</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Contacts signées montrés comme refusés</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Nom du contact</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Également signé par</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">ID du contact</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">Le certificat semble valide</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Certificat Retroshare non valide!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Invitation Retroshare</translation>
     </message>
@@ -3318,12 +3864,12 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>C&apos;est votre propre certificat! Vous ne voulez pas devenir ami avec vous même. N&apos;est-ce pas?</translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3331,7 +3877,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation>Cette clé est déjà dans votre liste de confiance.</translation>
     </message>
@@ -3371,7 +3917,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>Vous avez une demande d&apos;amitié de</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3396,7 +3942,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3406,7 +3952,47 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">L&apos;importation du certificat a échoué : le fichier %1 n&apos;a pas été trouvé</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Ce contact %1 n&apos;est pas disponible dans votre réseau</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Utiliser le nouveau format de certificat (plus sure, plus robuste)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Utilisez l&apos;ancien format de certificat (rétrocompatible)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Supprimer les signatures</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">Invitation Retroshare</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Aide pour l&apos;envoi du certificat</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Vous pouvez copier votre certificat et l&apos;envoyer à vos amis par courrier électronique ou par tout autre moyen</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Votre certificat a été copié dans le presse-papier, collez-le et envoyez-le par courrier electronique ou par tout autre moyen</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Enregistrer sous...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3445,7 +4031,11 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>*** Aucune ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Utiliser en source directe, quand disponible</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>Addr-IP :</translation>
     </message>
@@ -3455,7 +4045,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>Adresse IP</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Afficher les options avancées</translation>
     </message>
@@ -3464,6 +4054,10 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signer la clé d&apos;un ami est une façon d&apos;exprimer à vos autres amis votre confiance en cet ami. Cela les aide à décider, en se basant sur votre propre confiance, si ils doivent permettre des connexions depuis cette clé. Signer une clé est absolument facultatif et ne peut pas être défait, alors faites-le avec sagesse.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare vérifie périodiquement vos listes d&apos;amis pour les recherches de  fichier correspondant à vos transferts, afin d&apos;établir un transfert direct. Dans ce cas, votre ami sait que vous téléchargez le fichier.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Pour éviter ce comportement pour cet ami uniquement, décochez cette case. Vous pouvez toujours effectuer un transfert direct si vous le demandez explicitement, par ex. Téléchargement de la liste de fichiers de votre ami. Ce paramètre est appliqué à tous les emplacements de même ami.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3474,13 +4068,45 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les personnes qui ont cette option ne peuvent pas se connecter si leur adresse de connexion n&apos;est pas dans la liste blanche. Cela vous protège contre les attaques de transfert de trafic. Lorsqu&apos;ils sont utilisés, les homologues rejetés seront signalés par des &amp;quot;alertes de sécurité&amp;quot; dans le fil d&apos;actualité. De là, vous pouvez mettre en liste blanche ou noir leur IP. S&apos;applique à tous les emplacements de même personne.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Recommander plusieurs amis les uns aux autres</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Recommandations d&apos;amis</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">Le texte ci-dessous est votre certificat Retroshare. Vous devez le fournir à votre ami</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Message :</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Amis recommandés</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Pour</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Veuillez sélectionner au moins un ami à recommander.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Veuillez sélectionner au moins un destinataire.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Ajouter la clé au trousseau</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Cette clé est déjà dans votre trousseau</translation>
     </message>
@@ -3496,7 +4122,7 @@ l&apos;envoi de messages distants à ce
 contact même si vous n&apos;êtes pas amis.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Le certificat a un mauvais numéro de version. Souvenez-vous que les réseaux v0.6 et v0.5 sont incompatibles.</translation>
     </message>
@@ -3531,7 +4157,7 @@ contact même si vous n&apos;êtes pas amis.</translation>
         <translation>Ajouter l&apos;IP dans la liste blanche</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>Pas d&apos;IP dans ce certificat !</translation>
     </message>
@@ -3541,10 +4167,27 @@ contact même si vous n&apos;êtes pas amis.</translation>
         <translation>&lt;p&gt;Ce certificat n&apos;a pas d&apos;IP. Vous devrez compter sur la découverte et la DHT pour le trouver. Parce que vous exigez l&apos;autorisation liste blanche, le pair lèvera un avertissement de sécurité dans l&apos;onglet &quot;Fil d&apos;actualités&quot;. De là, vous pourrez passer son IP en liste blanche.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished">[Inconnu]</translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Ajoutée avec certificat depuis %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Coller le certificat de votre ami depuis le presse-papier</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Échec de chargement du certificat : ne peut pas lire le fichier %1</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Échec de chargement du certificat : quelque chose ne va pas dans %1</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3606,7 +4249,7 @@ contact même si vous n&apos;êtes pas amis.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>Réglage UDP</translation>
     </message>
@@ -3642,7 +4285,7 @@ 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;Lucida Grande&apos;; font-size:13pt;&quot;&gt;vous pouvez fermer la fenêtre.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Assistant de connexion</translation>
     </message>
@@ -3652,20 +4295,17 @@ p, li { white-space: pre-wrap; }
         <translation>ID du contact incorrecte </translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>État inconnu</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Hors ligne</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Derrière un NAT symétrique</translation>
     </message>
@@ -3675,14 +4315,12 @@ p, li { white-space: pre-wrap; }
         <translation>Derrière un NAT &amp; Pas de DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Redémarrage du NET</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>Derrière un NAT</translation>
     </message>
@@ -3692,8 +4330,7 @@ p, li { white-space: pre-wrap; }
         <translation>Pas de DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>ÉTAT DU NET : BON !</translation>
     </message>
@@ -3718,7 +4355,7 @@ p, li { white-space: pre-wrap; }
         <translation>Recherche de contacts RS</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Lookup nécessite la DHT</translation>
     </message>
@@ -4010,7 +4647,7 @@ p, li { white-space: pre-wrap; }
         <translation>Veuillez réessayez d&apos;importer le certificat en entier</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4018,8 +4655,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>FORWARD INVÉRIFIABLE !</translation>
     </message>
@@ -4029,7 +4665,7 @@ p, li { white-space: pre-wrap; }
         <translation>FORWARD INVÉRIFIABLE &amp; PAS DE DHT</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Recherche</translation>
     </message>
@@ -4065,12 +4701,12 @@ p, li { white-space: pre-wrap; }
         <translation>Détails du cercle</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le nom du cercle, le contact de l&apos;auteur et la liste des membres invités sera visible à tous les invités. Si le cercle n&apos;est pas privé, ils seront également visibles aux nœuds voisins de ceux qui hébergent les invités.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </translation>
     </message>
@@ -4090,7 +4726,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>IDs</translation>
     </message>
@@ -4110,18 +4746,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtre</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Membres invités</translation>
     </message>
@@ -4136,7 +4772,15 @@ p, li { white-space: pre-wrap; }
         <translation>Personnes connues</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Type</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
@@ -4176,19 +4820,23 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les cercles peuvent être limités aux membres d&apos;un autre cercle. Seuls les membres de ce deuxième cercle seront autorisés à voir le nouveau cercle et son contenu (la liste des membres, etc)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Seulement visible par les membres de :</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>S&apos;il vous plaît donnez un nom à votre cercle</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Aucune restriction de cercle sélectionnée</translation>
     </message>
@@ -4198,24 +4846,12 @@ p, li { white-space: pre-wrap; }
         <translation>Aucune limitation de cercle sélectionnée</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Inconnu]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
@@ -4225,7 +4861,7 @@ p, li { white-space: pre-wrap; }
         <translation>Enlever</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Rechercher</translation>
@@ -4240,6 +4876,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Signé</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Signé par des noeuds connus</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4256,6 +4896,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>Identité PGP</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">ID anon</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4278,13 +4922,17 @@ p, li { white-space: pre-wrap; }
         <translation>Créer un nouveau cercle</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Créer</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">ID PGP liée</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Ajouter membre</translation>
     </message>
@@ -4303,7 +4951,7 @@ p, li { white-space: pre-wrap; }
         <translation>Créer un groupe</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Nom du groupe :</translation>
     </message>
@@ -4338,7 +4986,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Nouvel article sur la chaîne</translation>
     </message>
@@ -4348,7 +4996,7 @@ p, li { white-space: pre-wrap; }
         <translation>Message</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4409,11 +5057,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Utiliser &quot;glisser-déposer&quot; / le bouton d&apos;ajout, pour hacher de nouveaux fichiers.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copier/collez des liens Retroshare depuis vos partages.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Joindre un fichier</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Incorporer une miniature</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Message</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Sujet :</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4499,17 +5159,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4528,18 +5188,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Fichier déjà ajouté et hashé</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Veuillez ajouter un sujet à votre message</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Charger la miniature</translation>
     </message>
@@ -4554,12 +5213,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Générer des données en masse</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Voulez-vous vraiment générer %1 messages ?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Vous êtes sur le point d&apos;ajouter les fichiers que vous ne partagez pas actuellement. Voulez-vous toujours faire cela ?</translation>
     </message>
@@ -4593,7 +5258,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Poster un message sur le forum</translation>
     </message>
@@ -4602,6 +5267,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Sujet</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4622,8 +5291,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4642,7 +5311,7 @@ p, li { white-space: pre-wrap; }
         <translation>Vous pouvez joindre des fichiers par glisser/déposer</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4672,17 +5341,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Aucun forum</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>En réponse à</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Titre</translation>
     </message>
@@ -4736,7 +5405,7 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished">Charger le fichier image</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>Pas d&apos;ID compatible pour ce forum</translation>
     </message>
@@ -4746,8 +5415,8 @@ Voulez-vous annuler ce message?</translation>
         <translation>Aucune de vos identités n&apos;est autorisée à poster dans ce forum. Ceci pourrait être dû à un forum qui serait limité à un cercle qui ne contient aucune de vos identités, ou à des drapeaux de forum exigeant une identité signée en PGP.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Générer des données en masse</translation>
     </message>
@@ -4756,6 +5425,10 @@ Voulez-vous annuler ce message?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Voulez-vous vraiment générer %1 messages ?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Envoyer</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4770,7 +5443,23 @@ Voulez-vous annuler ce message?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Créer un salon de tchat</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Un salon de chat est un tchat en groupe décentralisé et anonyme. Tous les participants reçoivent tous les messages. Une fois que le salon est créé, vous pouvez inviter d&apos;autres amis à partir de l&apos;onglet Amis.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Nom du salon :</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Sujet du salon : </translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4805,7 +5494,7 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Créer</translation>
     </message>
@@ -4815,7 +5504,11 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si vous cochez ceci, seules les IDs signées en PGP peuvent être utilisées pour rejoindre ce salon et y parler. Cette limitation empêche le publipostage anonyme excessif car il devient possible pour au moins quelques personnes dans ce salon de localiser le noeud du spammeur.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>nécessite des identités signées PGP</translation>
     </message>
@@ -4830,7 +5523,11 @@ Voulez-vous annuler ce message?</translation>
         <translation>Selectionner les amis avec qui vous voulez communiquer.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Amis invités</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Créer un salon de tchat</translation>
@@ -4851,7 +5548,7 @@ Voulez-vous annuler ce message?</translation>
         <translation>Contacts :</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Identité à utiliser :</translation>
     </message>
@@ -4859,17 +5556,17 @@ Voulez-vous annuler ce message?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Information publique</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Emplacement :</translation>
     </message>
@@ -4879,12 +5576,12 @@ Voulez-vous annuler ce message?</translation>
         <translation>ID de l&apos;emplacement :</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Version du logiciel : </translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>En ligne depuis :</translation>
     </message>
@@ -4904,7 +5601,12 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4914,7 +5616,7 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Autres informations</translation>
     </message>
@@ -4924,12 +5626,17 @@ Voulez-vous annuler ce message?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished">Profil</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Certificat</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4939,7 +5646,11 @@ Voulez-vous annuler ce message?</translation>
         <translation>Inclure les signatures</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Enregistrer votre clé dans un fichier</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exporter l&apos;identité</translation>
     </message>
@@ -5013,33 +5724,33 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>Empreinte PGP :</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Information de noeud</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>ID PGP :</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Noeuds amis </translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5078,6 +5789,14 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>Node</source>
         <translation>Noeud</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Créer nouveau noeud ...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">afficher la fenêtre de statistiques</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5094,6 +5813,10 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Retroshare utilise la DHT de Bittorrent comme un proxy pour les connexions. Cela ne &quot;stocke&quot; pas votre IP dans la DHT. 				                        Au lieu de cela, la DHT est utilisée par vos amis pour vous atteindre tout en effectuant des requêtes DHT standards. 												Le voyant de statut deviendra vert aussitôt que Retroshare obtiendra une réponse DHT d&apos;un de vos amis.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5129,7 +5852,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>o</translation>
     </message>
@@ -5797,7 +6520,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Ouvrir le fichier</translation>
     </message>
@@ -5805,38 +6528,38 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>à</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>Ignorer la casse</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>jj.MM.aaaa</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>Ko</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>Go</translation>
     </message>
@@ -5844,12 +6567,12 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Expression Widget</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Supprimer cette expression</translation>
     </message>
@@ -6011,7 +6734,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Image</translation>
     </message>
@@ -6021,7 +6744,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6081,21 +6804,11 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Dossiers partagés de mes amis</translation>
     </message>
@@ -6217,7 +6930,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -6252,6 +6965,10 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>Show State</source>
         <translation>Afficher l&apos;état</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">Amis de confiance</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6259,7 +6976,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Afficher les groupes</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
@@ -6295,7 +7012,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Ajouter à un groupe</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Rechercher</translation>
@@ -6311,7 +7028,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Trier par état</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Détails du profil</translation>
     </message>
@@ -6556,7 +7273,7 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Accepter la demande d&apos;amitié</translation>
     </message>
@@ -6573,6 +7290,10 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Rechercher :</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6594,7 +7315,7 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Rechercher des amis</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Tout marquer</translation>
     </message>
@@ -6605,134 +7326,16 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Marquer aucun</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Nom</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished">Adresse</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Statut</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Devenir ami</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished">Ce proxy n&apos;est pas activé ou est cassé.
-Tous les services sont-ils bien en marche ?
-Vérifiez aussi vos ports !</translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Modifier le message d&apos;état</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Tchat entre amis</translation>
     </message>
@@ -6815,38 +7418,33 @@ Vérifiez aussi vos ports !</translation>
         <translation>Réinitialiser à la valeur par défaut</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Trousseau</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Réseau&lt;/h1&gt; &lt;p&gt;L&apos;onglet réseau montre les noeuds de vos amis Retroshare : les noeuds Retroshare voisins qui sont connectés à vous.&lt;/p&gt; &lt;p&gt;Vous pouvez grouper les noeuds ensemble pour permettre un niveau d&apos;accès plus fin à l&apos;information, par exemple pour permettre seulement à quelques noeuds de voir vos fichiers.&lt;/p&gt; &lt;p&gt;Sur la droite, vous trouverez 3 onglets utiles : &lt;ul&gt; &lt;li&gt;Tchat entre amis (en anglais : &quot;broadcast&quot;) : diffuse les messages immédiatement à tous les noeuds amis connectés&lt;/li&gt; &lt;li&gt;Graphe réseau : ce graphe montre le réseau autours de vous, en se basant sur l&apos;information de découverte&lt;/li&gt; &lt;li&gt;Trousseau : contient les clés des noeuds que vous avez collecté, elles sont transférées jusqu&apos;à vous principalement par les noeuds de vos amis&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt; </translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retroshare broadcast chat : les messages sont envoyés à tous vos amis en ligne.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Graphe réseau</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Mettez ici votre message de statut.</translation>
     </message>
@@ -6864,17 +7462,7 @@ Vérifiez aussi vos ports !</translation>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Tous les champs sont requis avec un minimum de 3 caractères</translation>
     </message>
@@ -6884,12 +7472,17 @@ Vérifiez aussi vos ports !</translation>
         <translation>Les mots de passe ne correspondent pas</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation>Utiliser BOB</translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Ce mot de passe est pour PGP</translation>
@@ -6910,38 +7503,50 @@ Vérifiez aussi vos ports !</translation>
         <translation>Échec lors de la génération de votre nouveau certificat, peut-être que votre mot de passe PGP est faux !</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <source>Options</source>
+        <translation type="vanished">Options</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation>Longueur de la clé PGP</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Mettez un mot de passe fort ici. Ce mot de passe protège votre clé privée!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;S&apos;il vous plaît déplacer votre souris afin de recueillir autant de données aléatoires que possible. Un minimum de 20% est nécessaire pour créer votre clé d&apos;emplacement&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Emplacement standard</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">Emplacement Caché TOR/I2P</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Votre nom d&apos;emplacement désigne l&apos;instance de Retroshare exécutée sur cet ordinateur.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <source>Use existing profile</source>
+        <translation type="vanished">Utiliser un profil existant</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Nom de l&apos;emplacement</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6961,14 +7566,14 @@ Vérifiez aussi vos ports !</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le nom du profil vous identifie sur le réseau.
 Il est utilisé par vos amis pour accepter vos connexions.
 Vous pouvez créer plusieurs emplacement Retroshare avec le même profil sur différents ordinateurs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Exporter ce profil</translation>
     </message>
@@ -6978,7 +7583,7 @@ Vous pouvez créer plusieurs emplacement Retroshare avec le même profil sur dif
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cela doit être une adresse Tor Onion de la forme: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;ou une addresse I2P de cette forme: [52 characters].b32.i2p 
 
@@ -6987,40 +7592,39 @@ Pour en obtenir une, vous devez configurer Tor ou I2P pour créer un nouveau tun
 Vous pouvez également laisser ce champ vide, mais votre nœud ne fonctionnera que si vous définissez correctement l&apos;adresse de service Tor / I2P dans le panneau de configuration Préférences -&amp;gt; Réseaux -&amp;gt; Configuration Hidden Service.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les identités sont utilisées lorsque vous écrivez dans des salons de tchat, des forums et des commentaires de chaîne.
 
 Ils reçoivent/envoient également du courrier électronique sur le réseau Retroshare. Vous pouvez créer une identité signée maintenant, ou le faire plus tard lorsque vous en aurez besoin.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>C&apos;est parti !</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation>Étiquette</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Options avancées</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>adresse cachée</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Votre profil est associé à une paire de clé PGP. Actuellement RetroShare ignore les clés DSA.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ceci est votre port de connexion.&lt;/p&gt;&lt;p&gt;N&apos;importe quelle valeur entre 1024 et 65535 &lt;/p&gt;&lt;p&gt; devrait être OK. Il vous sera possible de la changer plus tard.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7068,13 +7672,13 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>Votre profil n&apos;a pas été sauvegardé. Une erreur est arrivée.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importer profil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Créer un nouveau profil et un nouveau emplacement Retroshare</translation>
     </message>
@@ -7084,7 +7688,7 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>Créer un nouveau emplacement Retroshare</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation>Adresse Tor/I2P</translation>
     </message>
@@ -7119,7 +7723,7 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7129,7 +7733,12 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La création du nœud est désactivée jusqu&apos;à ce que les champs soient correctement remplis.&lt;/p&gt;</translation>
     </message>
@@ -7139,7 +7748,12 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>&lt;p&gt;La création du nœud est désactivée jusqu&apos;à ce que suffisamment d&apos;éléments aléatoires soient collectés. Veuillez déplacer votre souris jusqu&apos;à ce que vous atteigniez au moins 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation>Adresse d&apos;instance I2P avec BOB activé</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation>Adresse d&apos;instance I2P</translation>
     </message>
@@ -7365,13 +7979,36 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>Mise en route</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Inviter des amis</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Retroshare n&apos;est rien sans vos amis. Cliquez sur le bouton pour démarrer le procédure&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;&lt;/p&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-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Envoyez à vos amis un email avec votre &quot;certificat d&apos;identité&quot;.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;&lt;/p&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-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Soyez sur de recevoir leur invitation en retour... &lt;/span&gt;&lt;/p&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-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Vous ne pouvez vous connecter avec vos amis que si vous vous êtes mutuellement ajoutés les uns aux autres.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Ajouter vos amis à Retroshare</translation>
     </message>
@@ -7381,103 +8018,136 @@ et l&apos;utiliser au moyen du bouton d&apos;importation afin de le charger</tra
         <translation>Ajouter des amis</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Se connecter aux amis</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&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;
+&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:12pt;&quot;&gt;Soyez en ligne en même temps que vos amis et ainsi RetroShare vous connectera automatiquement !&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Votre client a besoin de trouver le réseau RetroShare avant qu&apos;il ne soit capable d&apos;effectuer des connexions.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Cela prend 5 à 30 minutes la première fois que vous démarrez RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;L&apos;indicateur DHT (dans la barre de statut) se colorera en vert lorsqu&apos;il pourra effectuer des connexions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Après deux minutes , l&apos;indicateur NAT (aussi situé dans la barre de statut) se colorera en jaune ou en vert.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Si il reste en rouge, alors vous avez un pare-feu ennuyeux, que RetroShare ne parvient pas à traverser.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Regardez dans la section &quot;Davantage d&apos;aide&quot; pour plus de conseils de connexion.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;/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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&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;
 &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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avancé : ouvrir un port dans le pare-feu</translation>
+&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:12pt;&quot;&gt;Vous pouvez augmenter la performance de votre Retroshare en ouvrant un port externe. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Cela va augmenter la vitesse des connexions et permettre à davantage de personnes de se connecter à vous. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;La façon la plus facile de faire cela consiste à activer UPnP dans votre box Sans-fil ou Routeur.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Comme chaque routeur est conçu différemment, vous devrez découvrir votre modèle de routeur et rechercher dans Internet afin de trouver des instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Si rien de tout ceci ne vous paraît évident, ne vous inquiétez pas Retroshare marchera malgré tout.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&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;
+&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:12pt;&quot;&gt;Rencontrez vous des difficultés pour débuter avec RetroShare ?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Lisez la FAQ située dans le Wiki. Elle est un peu vieille, nous essayons de l&apos;actualiser.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Regardez les forums en ligne. Posez des questions et discutez des fonctionnalités.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Essayez les forums internes à RetroShare &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- Ceux-ci arriveront en ligne lorsque vous serez connecté à des amis.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) Si vous êtes encore bloqué, écrivez-nous.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Appréciez Retroshare&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Se connecter aux amis</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&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;
+&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:12pt;&quot;&gt;Quand vos amis vous envoient leurs invitations, cliquez pour ouvrir la fenêtre Ajout d&apos;amis.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Collez les &amp;quot;Certificats ID&amp;quot; de vos amis dans la fenêtre puis ajoutez-les comme amis.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avancé : ouvrir un port dans le pare-feu</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Aide supplémentaire et support</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Ouvrir le site web de RS</translation>
     </message>
@@ -7502,7 +8172,7 @@ p, li { white-space: pre-wrap; }
         <translation>Commentaires par email</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>Invitation Retroshare</translation>
     </message>
@@ -7552,12 +8222,12 @@ p, li { white-space: pre-wrap; }
         <translation>Retour-utilisateur Retroshare</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>Aide Retroshare</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Il a de nombreuses fonctionnalités, telles qu&apos;un tchat intégré, messagerie,</translation>
     </message>
@@ -7681,7 +8351,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Afficher le Tchat public</translation>
     </message>
@@ -7689,7 +8359,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[Inconnu]</translation>
     </message>
@@ -7855,11 +8525,19 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Vous pouvez laisser vos amis prendre connaissance de votre forum en le partageant avec eux. Choisissez les amis avec lesquels vous voulez partager votre forum.</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">Partager les permissions d&apos;administration de sujet</translation>
+    </message>
+    <message>
+        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
+        <translation type="vanished">Vous pouvez permettre à vos amis d&apos;éditer le sujet. Choisissez-les dans la liste ci-dessous. Note : il n&apos;est pas possible de révoquer des permissions d&apos;administration Postées (Posted admin permissions).</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Titre</translation>
     </message>
@@ -7872,12 +8550,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7902,7 +8580,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">Trier Ordre décroissant</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">Trier Ordre croissant</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">Trier par nom</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Trier par popularité</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Trier par dernier message</translation>
+    </message>
+    <message>
+        <source>Sort by Number of Posts</source>
+        <translation type="vanished">Trier par quantité de messages</translation>
+    </message>
+    <message>
+        <source>Sort by Unread</source>
+        <translation type="vanished">Trier par Non lus</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Vous êtes administrateur (modifiez les noms et la description en utilisant le menu Edition)</translation>
     </message>
@@ -7917,14 +8623,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Dernier commentaire</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
@@ -7935,13 +8641,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularité</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Jamais</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Affichage</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7954,7 +8664,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>et</translation>
     </message>
@@ -8090,7 +8800,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Chaînes</translation>
@@ -8101,22 +8811,34 @@ p, li { white-space: pre-wrap; }
         <translation>Créer une chaîne</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Activer le téléchargement automatique</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Vos chaînes</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chaînes&lt;/h1&gt; &lt;p&gt;Les chaînes vous permettent de poster des données (exemples : films, musiques) qui seront diffusées dans le réseau
+
+Vous pouvez voir les chaînes auxquelles sont abonnés vos amis, et vous transférez automatiquement à vos amis les chaînes auxquelles vous êtes abonné. Ceci promeut les bonnes chaînes dans le réseau.
+
+Seul le créateur d&apos;une chaîne peut poster dans cette chaîne. Les autres personnes dans le réseau peuvent seulement lire dedans, à moins que la chaîne ne soit privée. Vous pouvez cependant partager les droits de poster ou de lire avec vos amis Retroshare.
+
+Les chaînes peuvent être anonymes, ou attachées à une identité Retroshare afin que les lecteurs puissent prendre contact avec vous si besoin. Permettez &quot;Autoriser commentaires&quot; si vous voulez laisser la possibilité aux utilisateurs de commenter vos postages.
+
+Les publications sont conservés pendant %1  jours et synchronisés au cours des derniers %2 jours, à moins que vous ne les modifiez.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Chaînes abonnées</translation>
     </message>
@@ -8136,12 +8858,12 @@ p, li { white-space: pre-wrap; }
         <translation>Spécifier le répertoire de téléchargement pour cette chaîne</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Désactiver le téléchargement automatique</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>Spécifier le répertoire de téléchargement</translation>
     </message>
@@ -8176,22 +8898,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Ouvrir dossier</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
@@ -8211,17 +8933,17 @@ p, li { white-space: pre-wrap; }
         <translation>Vérification</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Êtes-vous sûr(e) de vouloir annuler et supprimer ce fichier ?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Impossible d&apos;ouvrir le dossier</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Lecture</translation>
     </message>
@@ -8231,10 +8953,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Le fichier %1 n&apos;existe pas à cet endroit.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulaire</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Nom du fichier</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Taille</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Titre</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Publié</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Statut</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Créer une nouvelle chaîne</translation>
     </message>
@@ -8272,19 +9021,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>S&apos;abonner à la chaîne</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8298,7 +9037,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Étendre</translation>
     </message>
@@ -8313,7 +9052,7 @@ p, li { white-space: pre-wrap; }
         <translation>Description de la chaîne</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Chargement</translation>
     </message>
@@ -8328,9 +9067,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">Jamais</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Nouvelle chaîne</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8341,7 +9079,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Nouveau commentaire&#xa0;:</translation>
     </message>
@@ -8362,7 +9100,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Lecture</translation>
     </message>
@@ -8418,24 +9156,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Avertissement ! Vous avez moins de %1 heure(s) et %2 minute(s) avant que ce fichier ne soit supprimé. Pensez à l&apos;enregistrer.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
@@ -8450,17 +9192,21 @@ p, li { white-space: pre-wrap; }
         <translation>Je n&apos;aime pas ça</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Chargement</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation>Commentaires</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8485,16 +9231,139 @@ p, li { white-space: pre-wrap; }
         <translation>Lire le média</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Poster dans la chaîne</translation>
+    </message>
+    <message>
+        <source>Add new post</source>
+        <translation type="vanished">Ajouter une nouvelle publication</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Chargement</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Chercher chaînes</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Titre</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Chercher titre</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Message</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Chercher message</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Nom du fichier</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Chercher nom de fichier</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Aucune chaîne sélectionnée</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Jamais</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Public</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle &quot;</source>
+        <translation type="vanished">Limité aux membres du cercle &quot;</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle </source>
+        <translation type="vanished">Limité aux membres du cercle</translation>
+    </message>
+    <message>
+        <source>Your eyes only</source>
+        <translation type="vanished">Vos yeux seulement</translation>
+    </message>
+    <message>
+        <source>You and your friend nodes</source>
+        <translation type="vanished">Vous et vos noeuds amis</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Désactiver le téléchargement automatique</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Activer le téléchargement automatique</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Afficher les flux</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Afficher les fichiers</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Administrateur :</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Dernier message :</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">inconnu</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Distribution :</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Flux</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Fichiers</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Abonnés</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Description :</translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">Posts (chez vos noeuds voisins) :</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Poster dans la chaîne</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished">Ajouter une nouvelle publication</translation>
     </message>
@@ -8564,7 +9433,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8600,7 +9469,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Commentaires</translation>
     </message>
@@ -8615,13 +9484,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Flux</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8636,7 +9505,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8651,7 +9520,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8711,22 +9580,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8801,13 +9660,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Vous et vos noeuds amis</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Abonné</translation>
     </message>
@@ -8858,17 +9716,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8888,11 +9746,27 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Supprimer</translation>
     </message>
+    <message>
+        <source>for identity </source>
+        <translation type="vanished">pour l&apos;identité </translation>
+    </message>
+    <message>
+        <source>You received a membership request for circle:</source>
+        <translation type="vanished">Vous avez reçu une demande d&apos;adhésion pour le cercle:</translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Demande d&apos;adhésion</translation>
     </message>
+    <message>
+        <source>Revoke membership request</source>
+        <translation type="vanished">Révoquer la demande d&apos;adhésion</translation>
+    </message>
+    <message>
+        <source>You received an invitation for circle:</source>
+        <translation type="vanished">Vous avez reçu une invitation pour le cercle:</translation>
+    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -8983,7 +9857,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Le conteneur de commentaires</translation>
     </message>
@@ -8996,7 +9870,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9026,7 +9900,7 @@ p, li { white-space: pre-wrap; }
         <translation>Rafraîchir</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
@@ -9065,7 +9939,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Répondre au commentaire</translation>
     </message>
@@ -9089,21 +9963,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Voter -</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9113,7 +9972,7 @@ p, li { white-space: pre-wrap; }
         <translation>Commenter</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9142,10 +10001,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Commentaire&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Signé par</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9174,7 +10049,7 @@ before you can comment</source>
 avant de pouvoir commenter</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9216,6 +10091,14 @@ avant de pouvoir commenter</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Ajouter admins de forum</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Sélectionner admins de forum</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9225,7 +10108,7 @@ avant de pouvoir commenter</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>S&apos;abonner au forum</translation>
     </message>
@@ -9241,7 +10124,7 @@ avant de pouvoir commenter</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Montrer</translation>
     </message>
@@ -9261,9 +10144,8 @@ avant de pouvoir commenter</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Chargement</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9294,13 +10176,13 @@ avant de pouvoir commenter</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Sujet : </translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Se désabonner du forum</translation>
     </message>
@@ -9311,7 +10193,7 @@ avant de pouvoir commenter</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Montrer</translation>
     </message>
@@ -9331,17 +10213,21 @@ avant de pouvoir commenter</translation>
         <translation>En réponse à :</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Chargement</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Flux de forum</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
@@ -9354,66 +10240,63 @@ avant de pouvoir commenter</translation>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Lancer un nouveau fil dans le forum sélectionné</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Chercher</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Dernier article</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation>Nouveau fil</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Affichage en arborescence</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Affichage à plat</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Titre</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Sauvegarder image</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Chargement</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9423,7 +10306,12 @@ avant de pouvoir commenter</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Répondre au message</translation>
     </message>
@@ -9447,6 +10335,10 @@ avant de pouvoir commenter</translation>
         <source>Download all files</source>
         <translation>Télécharger tous les fichiers</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Suivant non lu</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9463,23 +10355,36 @@ avant de pouvoir commenter</translation>
         <translation>Rechercher par auteur</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Contenu</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Rechercher contenu</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;L&apos;abonnement au forum rassemblera les messages disponibles à partir de vos amis qui y sont abonnés et rendra le forum visible à tous vos autres amis.
+Ensuite vous pourrez vous désabonner via le menu contextuel de la liste des forums à gauche.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Aucun nom</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9522,12 +10427,20 @@ avant de pouvoir commenter</translation>
         <translation>Copier le lien Retroshare</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Montrer</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Banni]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[inconnu]</translation>
     </message>
@@ -9557,8 +10470,8 @@ avant de pouvoir commenter</translation>
         <translation>Vos yeux seulement</translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation>Distribution</translation>
     </message>
@@ -9572,6 +10485,26 @@ avant de pouvoir commenter</translation>
         <source>Anti-spam</source>
         <translation>Anti-spam</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Message rédigé ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anonyme</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">Signé</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">Aucun</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Message manquant... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9641,12 +10574,16 @@ avant de pouvoir commenter</translation>
         <translation>Message d&apos;origine</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation>Nouveau fil</translation>
     </message>
     <message>
-        <location line="+331"/>
+        <source>Read status</source>
+        <translation type="vanished">Lire l&apos;état</translation>
+    </message>
+    <message>
+        <location line="+318"/>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
@@ -9707,7 +10644,7 @@ avant de pouvoir commenter</translation>
         <translation>Réputation de l&apos;auteur</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9727,7 +10664,7 @@ avant de pouvoir commenter</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Messages anonymes / inconnus transmis si la réputation est positive</translation>
     </message>
@@ -9779,7 +10716,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9789,7 +10726,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9804,7 +10741,26 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <source>Information for this identity is currently missing.</source>
+        <translation type="vanished">Les informations pour cette identité sont actuellement manquantes.</translation>
+    </message>
+    <message>
+        <source>You have banned this ID. The message will not be
+displayed nor forwarded to your friends.</source>
+        <translation type="vanished">Vous avez banni cet ID. Le message ne sera pas affiché ou transmis à vos amis.</translation>
+    </message>
+    <message>
+        <source>You have not set an opinion for this person,
+ and your friends do not vote positively: Spam regulation 
+prevents the message to be forwarded to your friends.</source>
+        <translation type="vanished">Vous n&apos;avez pas donné d&apos;opinion pour cette personne et vos amis ne votent pas positivement: La régulation du spam empêche le message d&apos;être transmis à vos amis.</translation>
+    </message>
+    <message>
+        <source>Message will be forwarded to your friends.</source>
+        <translation type="vanished">Le message sera transmis à vos amis.</translation>
+    </message>
+    <message>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation>(Derniers)</translation>
     </message>
@@ -9813,6 +10769,10 @@ This message is missing. You should receive it later.</source>
         <source>(Old) </source>
         <translation>(Anciens)</translation>
     </message>
+    <message>
+        <source>You cant act on the author to a non-existant Message</source>
+        <translation type="vanished">Vous ne pouvez pas agir sur l&apos;auteur pour un message inexistant</translation>
+    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -9870,12 +10830,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt; &lt;p&gt;Les forums de Retroshare ressemblent aux forums d&apos;internet, mais ils fonctionnent de façon décentralisée.
+Vous voyez les forums auxquels sont abonnés vos amis, et vous transférez à vos amis les forums auxquels vous vous êtes abonné. Ceci promeut automatiquement dans le réseau les forums intéressants.
+Les messages du forum sont conservés pour %1 jours et synchronisés au cours des derniers %2 jours, à moins que vous ne les configuriez autrement.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forums</translation>
@@ -9906,16 +10868,35 @@ This message is missing. You should receive it later.</source>
         <translation>Autres forums</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">En attente</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Récupération</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Chargement</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Ajouter une icône</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Ceux avec qui vous partagez votre clé peuvent publier sur les types de groupe à accès limité, et  peuvent voir et publier sur les chaines à accès privé</translation>
     </message>
@@ -9924,14 +10905,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Partager la clé de publication</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">Visualiser les personnes avec qui vous partagez votre clé de publication privée</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Clé partagée avec</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Distribution de message</translation>
     </message>
@@ -9939,7 +10928,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Public</translation>
     </message>
@@ -9958,6 +10947,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nouveau fil</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Requis</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Msgs chiffrés</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9999,7 +10996,7 @@ This message is missing. You should receive it later.</source>
         <translation>Protection Spam</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Commentaires :</translation>
     </message>
@@ -10022,7 +11019,7 @@ This message is missing. You should receive it later.</source>
         <translation>Anti-spam :</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10038,12 +11035,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation>Limité au groupe :</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation>Limité à vos amis</translation>
     </message>
@@ -10060,23 +11057,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>Suivi de message</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>Signature PGP requise</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Jamais</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation>Seulement les noeuds d&apos;amis dans le groupe</translation>
     </message>
@@ -10092,28 +11089,30 @@ This message is missing. You should receive it later.</source>
         <translation>Veuillez ajoutez un nom</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>La signature PGP de l&apos;ID connue est exigée</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Charger le logo du groupe</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Soumettre des changements de groupe</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Echec à préparer les méta-données de groupe - veuillez examiner</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Sera utilisé pour envoyer du retour d&apos;information</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Propriétaire :</translation>
     </message>
@@ -10123,12 +11122,12 @@ This message is missing. You should receive it later.</source>
         <translation>Mettez ici une description descriptive</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10138,7 +11137,7 @@ This message is missing. You should receive it later.</source>
         <translation>Dernier article</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les messages se propageront bien au-delà de vos nœuds amis, à condition que les gens s&apos;abonnent à la chaîne, au forum ou à la publication que vous créez.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -10213,12 +11212,7 @@ This message is missing. You should receive it later.</source>
         <translation>Défavoriser les IDs non signées et les IDs issues de noeuds inconnus</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Popularité</translation>
     </message>
@@ -10234,22 +11228,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Créer</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Auteur</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>GxsIdLabel</translation>
     </message>
@@ -10257,7 +11256,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Chargement</translation>
     </message>
@@ -10317,7 +11316,7 @@ This message is missing. You should receive it later.</source>
         <translation>Modifier détails</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation>Synchronisation des derniers messages...</translation>
     </message>
@@ -10374,12 +11373,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <source>Share publish permissions</source>
+        <translation type="vanished">Partager les permissions de publication</translation>
+    </message>
+    <message>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Copier le lien Retroshare</translation>
     </message>
@@ -10402,7 +11405,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Sans signature</translation>
     </message>
@@ -10415,24 +11418,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Chargement</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Non trouvé</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Sans signature</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Banni]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Authentification</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>clé inconnue</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">anonyme</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10442,12 +11461,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Nom&amp;nbsp;d&apos;identité</translation>
     </message>
@@ -10461,20 +11475,16 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished">Noeud</translation>
     </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">Signé&amp;nbsp;par</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Inconnu]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10486,7 +11496,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10534,13 +11544,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Inconnu]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Chargement</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10657,6 +11671,10 @@ This message is missing. You should receive it later.</source>
         <source>Group ID / Author</source>
         <translation>ID du groupe / Auteur</translation>
     </message>
+    <message>
+        <source>Number of messages / Publish TS</source>
+        <translation type="vanished">Nombre de message / Tampon Horaire de publication (TS)</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -10672,6 +11690,10 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation>Popularité</translation>
     </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Détails</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -10704,6 +11726,41 @@ This message is missing. You should receive it later.</source>
         <translation>Non</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">Tunnels authentifiés :</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">ID de tunnel : %1</translation>
+    </message>
+    <message>
+        <source>from: %1</source>
+        <translation type="vanished">depuis : %1</translation>
+    </message>
+    <message>
+        <source>to: %1</source>
+        <translation type="vanished">vers : %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">statut : %1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">total envoyé : %1 octets</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">total reçu : %1 octets</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Pair inconnu</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10916,12 +11973,48 @@ This message is missing. You should receive it later.</source>
         <source>About</source>
         <translation>À propos</translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare est une plateforme de communication décentalisée, sécurisée et privée, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;elle est open-source et trans-plateformes.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Elle vous laisse partager avec vos amis de façon sécurisée, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;en utilisant un web-de-confiance (web-of-trust) pour authentifier les pairs, et OpenSSL pour chiffrer toutes les communications. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare permet partage de fichiers, tchat, messages, et chaînes&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Liens externes utiles pour davantage d&apos;information :&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Forum de RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Page du projet Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Blog de l&apos;équipe RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Twitter de dév RetroShare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+37"/>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10937,7 +12030,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
@@ -10956,7 +12049,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10969,6 +12062,36 @@ 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traductions RetroShare :&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Traducteurs du site web de RetroShare :&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Suédois : &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Allemand : &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polonais : &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -11034,12 +12157,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+121"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+158"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11054,7 +12177,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11063,12 +12186,32 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Did you receive a certificate from a friend?</source>
+        <translation type="vanished">Avez-vous reçu le certificat d&apos;un ami ?</translation>
+    </message>
+    <message>
+        <source>Add friends certificate</source>
+        <translation type="vanished">Ajouter le certificat d&apos;un ami</translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">Ajouter un fichier de certificat</translation>
+    </message>
+    <message>
+        <source>Share your RetroShare Key</source>
+        <translation type="vanished">Partagez votre clé RetroShare</translation>
+    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
+        <translation type="vanished">Le texte ci-dessous est votre propre certificat Retroshare. Envoyez-le à vos amis</translation>
+    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -11079,12 +12222,20 @@ Plate-forme de communication décentralisée privée et sécurisée.
 </translation>
     </message>
     <message>
-        <location line="+134"/>
+        <source>Launch startup wizard</source>
+        <translation type="vanished">Lancez l&apos;assistant de démarrage</translation>
+    </message>
+    <message>
+        <source>Do you need help with RetroShare?</source>
+        <translation type="vanished">Besoin d&apos;aide avec RetroShare?</translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>Open Web Help</source>
         <translation>Ouvrir l&apos;aide Web</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Copiez votre Certificat en mémoire.</translation>
     </message>
@@ -11094,7 +12245,7 @@ Plate-forme de communication décentralisée privée et sécurisée.
         <translation>Sauvez votre Certificat dans un fichier</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>Envoyez votre Certificat par e-mail</translation>
     </message>
@@ -11114,37 +12265,13 @@ Plate-forme de communication décentralisée privée et sécurisée.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11156,12 +12283,17 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+16"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11170,11 +12302,19 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Bienvenu sur Retroshare!&lt;/h1&gt; &lt;p&gt;Vous devez &lt;b&gt;vous faire des amis&lt;/b&gt;! Une fois que vous avez créé un réseau d&apos;amis, ou que vous vous êtes joint à un réseau existant,	 vous pourrez échanger des fichiers, discuter, parler dans des forums, etc.&lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;    &lt;/div&gt; Pour ce faire, copier votre certificat dans cette page et l&apos;envoyer à vos amis. Ensuite, ajouter le certificat de vos amis.&lt;p&gt;  &lt;p&gt;Une autre option est de rechercher sur Internet des &quot;Retroshare chat servers&quot; (administré indépendamment ). Ces serveurs vous permettent d&apos;échanger	 votre certificat avec un emplacement Retroshare dédié, grâce auquel	 vous pourrez rencontrer d&apos;autres personnes anonymement.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Invitation Retroshare</translation>
     </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Votre certificat a été copié en mémoire, collez-le et envoyez-le par courrier électronique ou par tout autre moyen</translation>
+    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -11446,14 +12586,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Réputation</translation>
     </message>
@@ -11463,12 +12603,12 @@ p, li { white-space: pre-wrap; }
         <translation>Rechercher</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>ID anonyme</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Créer une nouvelle identité</translation>
     </message>
@@ -11478,7 +12618,7 @@ p, li { white-space: pre-wrap; }
         <translation>Créer un nouveau cercle</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>Personnes</translation>
     </message>
@@ -11493,27 +12633,27 @@ p, li { white-space: pre-wrap; }
         <translation>Personne</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation>Option de &quot;ban&quot; :</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Bannir automatiquement toutes les identités signées par la même personne</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation>Votes des Amis :</translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Votes positifs</translation>
     </message>
@@ -11530,39 +12670,29 @@ p, li { white-space: pre-wrap; }
 Votes négatifs</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation>Statistiques d&apos;utilisation</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Nom du cercle</translation>
     </message>
@@ -11582,20 +12712,18 @@ Votes négatifs</translation>
         <translation>Cercles personnels</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Modifier l&apos;identité</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Supprimer l&apos;identité</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Tchater avec ce pair</translation>
     </message>
@@ -11605,78 +12733,78 @@ Votes négatifs</translation>
         <translation>Lancer un tchat distant avec ce pair</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation>ID du noeud propriétaire :</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Nom de l&apos;identité :</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>ID de l&apos;identité</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Envoyer message</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Info d&apos;identité</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>ID de l&apos;identité :</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Nom du noeud propriétaire :</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation>Créer nouveau...</translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Envoyer invitation</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Moyenne des avis des noeuds voisins concernant cette identité. Négatif est mauvais,&lt;/p&gt;&lt;p&gt; positif est bon. Zéro est neutre.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>Votre opinion :</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Négative</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>Neutre</translation>
     </message>
@@ -11687,17 +12815,17 @@ Votes négatifs</translation>
         <translation>Positive</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Le score de réputation global, représenté (accounting) pour vous et vos amis&lt;/p&gt;&lt;p&gt;Négatif est mauvais, positif est bon. Zéro est neutre. Si le score est trop bas,&lt;/p&gt;&lt;p&gt; l&apos;identité est indiquée comme néfaste et sera filtrée dans les forums, les salons de tchat,&lt;/p&gt;&lt;p&gt; les chaînes, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Générale :</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anonymes</translation>
     </message>
@@ -11712,24 +12840,24 @@ Votes négatifs</translation>
         <translation>Chercher ID</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Cette identité est possédée par vous-même</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>Mes propres identités</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>Mes contacts</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation>Options d&apos;affichage</translation>
     </message>
@@ -11744,12 +12872,7 @@ Votes négatifs</translation>
         <translation>Lié à mon noeud</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>Autres cercles</translation>
     </message>
@@ -11759,7 +12882,7 @@ Votes négatifs</translation>
         <translation>Cercles auxquels j&apos;appartient</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>ID du cercle :</translation>
     </message>
@@ -11834,7 +12957,7 @@ Votes négatifs</translation>
         <translation>Pas un membre (n&apos;a pas d&apos;accès aux données limitées à ce cercle)</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>ID de l&apos;identité :</translation>
     </message>
@@ -11864,7 +12987,7 @@ Votes négatifs</translation>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>Invité(e)</translation>
     </message>
@@ -11879,7 +13002,7 @@ Votes négatifs</translation>
         <translation>Membre</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>Modifier le cercle</translation>
     </message>
@@ -11927,7 +13050,7 @@ Votes négatifs</translation>
         <translation>Autoriser à adhérer</translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11938,7 +13061,7 @@ Vous devriez vous en débarrasser maintenant et en utiliser une nouvelle.
 Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Noeud inconnu]</translation>
@@ -11981,7 +13104,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Identité anonyme</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12061,7 +13184,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation>information</translation>
     </message>
@@ -12077,12 +13200,34 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Copier identité vers le presse-papiers</translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <source>Send invite?</source>
+        <translation type="vanished">Envoyer invitation ?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Voulez-vous vraiment envoyer une invitation avec votre certificat ?</translation>
+    </message>
+    <message>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Banni</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identités&lt;/h1&gt; &lt;p&gt;Dans cet onglet vous pouvez créer/éditer des &lt;b&gt;identités pseudo-anonymes&lt;/b&gt;, et des &lt;b&gt;cercles&lt;/b&gt;.
+&lt;p&gt;&lt;b&gt;Les identités&lt;/b&gt; sont utilisés pour identifier vos données de manière sécurisée : signez les messages dans les salons de tchat, les messages de forum et de canal, recevez des commentaires à l&apos;aide du système de messagerie intégré Retroshare, publiez des commentaires après les messages de canaux, discutez en utilisant des tunnels sécurisés, etc.&lt;/p&gt; 
+&lt;p&gt;Les identités peuvent éventuellement être &lt;b&gt;signées&lt;/b&gt; par le certificat de votre emplacement Retroshare. Les identités signées sont plus faciles à faire confiance mais sont facilement liées à l&apos;adresse IP de votre nœud.&lt;/p&gt; 
+&lt;p&gt;&lt;b&gt;Les Identités anonymes&lt;/b&gt; vous permettent d&apos;interagir anonymement avec d&apos;autres utilisateurs. Ils ne peuvent pas être falsifiés, mais personne ne peut prouver qui possède vraiment une identité donnée.&lt;/p&gt;
+ &lt;p&gt;&lt;b&gt;Les Cercles &lt;/b&gt; sont des groupes d&apos;identités (anonymes ou signés), qui sont partagés à distance sur le réseau. Ils peuvent être utilisés pour restreindre la visibilité aux forums, chaînes, etc.&lt;/p&gt;
+ &lt;p&gt;Un &lt;b&gt;cercle&lt;/b&gt; peut être restreint à un autre cercle, limitant ainsi sa visibilité aux membres de ce cercle ou même auto-restreint, ce qui signifie qu&apos;il est seulement visible pour les membres invités.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Unknown ID:</source>
+        <translation type="vanished">ID inconnu :</translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation> positif</translation>
     </message>
@@ -12126,11 +13271,19 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>Forums</source>
         <translation>Forums</translation>
     </message>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Publié</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Tchat</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Inconnu</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12151,6 +13304,14 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>Création d&apos;une signature d&apos;auteur en service %1</translation>
     </message>
+    <message>
+        <source>Message/vote/comment</source>
+        <translation type="vanished">Message/vote/commentaire</translation>
+    </message>
+    <message>
+        <source>%1 in %2 tab</source>
+        <translation type="vanished">%1 en %2 onglet</translation>
+    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12171,11 +13332,19 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Signature dans un système de tunnel distant.</translation>
     </message>
+    <message>
+        <source>Update of identity data.</source>
+        <translation type="vanished">Mise à jour des données d&apos;identité.</translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Validation de signature générique.</translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">Signature générique.</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12187,7 +13356,11 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Déchiffrement générique.</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <source>Membership verification in circle %1.</source>
+        <translation type="vanished">Vérification de l&apos;adhésion dans le cercle %1.</translation>
+    </message>
+    <message>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation>Ajouter aux contacts</translation>
     </message>
@@ -12237,21 +13410,21 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Salut,&lt;br&gt;je voudrais être ami avec vous sur RetroShare. &lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Pers.</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Votre avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>Liée(s) aux noeuds voisins</translation>
     </message>
@@ -12261,7 +13434,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Liée(s) aux noeuds distants</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Liée(s) à un noeud Retroshare ami</translation>
     </message>
@@ -12276,7 +13449,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Liée(s) à un noeud Retroshare inconnu</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Tchater avec cette personne </translation>
     </message>
@@ -12291,12 +13464,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Tchat distant avec cette personne refusé</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>Dernièrement utilisée :</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP connue</translation>
     </message>
@@ -12316,12 +13489,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Voulez-vous vraiment supprimer cette identité ?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Possédé par </translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Nom de noeud : </translation>
     </message>
@@ -12331,7 +13504,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>ID de noeud :</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>Vraiment supprimer ?</translation>
     </message>
@@ -12339,7 +13512,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
@@ -12369,7 +13542,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Pseudonyme</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12379,19 +13552,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Nouvelle identité</translation>
     </message>
@@ -12405,7 +13571,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12415,12 +13581,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Modifier l&apos;identité</translation>
@@ -12431,27 +13592,27 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished">Mettre à jour</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12471,7 +13632,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12481,7 +13642,11 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Erreur lors de la récupération de la clé !</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Erreur ID de la clé invalide</translation>
     </message>
@@ -12496,7 +13661,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Vrai nom inconnu</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Créer une nouvelle identité</translation>
     </message>
@@ -12506,15 +13671,10 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12540,7 +13700,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Créer</translation>
     </message>
@@ -12550,13 +13710,17 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Votre avatar</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Mettre l&apos;avatar</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>Liée à votre profil</translation>
     </message>
@@ -12566,7 +13730,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Vous pouvez avoir une seule ou plusieurs identités. Elles sont utilisées lorsque vous écrivez dans des salons de tchat, forums, et dans les commentaires de chaînes. Elles agissent comme destination pour le tchat distant et pour le système de courrier distant de Retroshare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Ce pseudonyme est trop court. Veuillez saisir au moins %1 caractères.</translation>
     </message>
@@ -12625,6 +13789,10 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>PGP name:</source>
         <translation>Nom PGP :</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">Id GXS :</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12640,7 +13808,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
@@ -12650,12 +13818,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Tout marquer</translation>
     </message>
@@ -12674,38 +13842,26 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <source>Quote</source>
         <translation type="unfinished">Citer</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Envoyer</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Sauvegarder image</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Ne peut pas sauvegarder l&apos;image, le nom de fichier est invalide</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation>Pas une image</translation>
     </message>
@@ -12723,32 +13879,27 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
-        <translation type="unfinished">Port :</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12769,12 +13920,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12783,31 +13929,26 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Ouvrir le fichier</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Ouvrir le dossier de destination</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Vérification en cours...</translation>
     </message>
@@ -12817,7 +13958,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Vérifier vos fichiers</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation>Recommander par messagerie à ...</translation>
     </message>
@@ -12845,7 +13986,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Ajouter un ami</translation>
     </message>
@@ -12861,8 +14002,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Options</translation>
     </message>
@@ -12883,7 +14023,7 @@ Ces identités ne seront bientôt plus supportées.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
@@ -12894,12 +14034,12 @@ Ces identités ne seront bientôt plus supportées.</translation>
         <translation>Assistant de configuration rapide</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>Retroshare %1 - Logiciel de communication sécurisé et décentralisé</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Inachevé</translation>
     </message>
@@ -12928,12 +14068,11 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Statut</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Notifications</translation>
     </message>
@@ -12944,35 +14083,31 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Ouvrir la messagerie</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Graphique de bande passante</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Réduire</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Agrandir</translation>
     </message>
@@ -12987,12 +14122,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 nouveau message</translation>
     </message>
@@ -13022,7 +14152,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>%1 amis connectés</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Etes-vous sûr de vouloir quitter Retroshare ?</translation>
     </message>
@@ -13042,7 +14172,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Afficher</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Assurez-vous que ce lien n&apos;a pas été créé pour vous emmener vers un site Web malveillant.</translation>
     </message>
@@ -13087,13 +14217,12 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Matrice des autorisations de services</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Statistiques</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Afficher l&apos;interface web</translation>
     </message>
@@ -13108,7 +14237,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>dossier a beaucoup diminué ! (la limite actuelle est</translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>Voulez-vous vraiment quitter ?</translation>
     </message>
@@ -13117,17 +14246,17 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Écrire</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Paragraphe</translation>
     </message>
@@ -13163,12 +14292,12 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Titre 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Augmenter la police</translation>
     </message>
@@ -13183,32 +14312,32 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Gras</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Italique</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Alignement</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Insérer une image</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Paramétrer la police d&apos;écriture dans le code</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Souligné</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Sujet : </translation>
     </message>
@@ -13219,32 +14348,32 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Mots clés</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>Liste d&apos;adresses : </translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation>Recommander cet ami</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Définir la couleur du texte</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Définir la couleur de fond du texte</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Fichiers recommandés</translation>
     </message>
@@ -13314,7 +14443,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Ajouter une citation</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Envoyer à :</translation>
     </message>
@@ -13338,6 +14467,10 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <source>&amp;Justify</source>
         <translation>&amp;Justifier le texte</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">Toutes adresses (mélangé)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13349,7 +14482,7 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>Mes contacts</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Bonjour, &lt;br&gt;Je vous recommande un(e) bon(nne) ami(e), vous pouvez lui faire confiance autant qu&apos;à moi. &lt;br&gt;</translation>
     </message>
@@ -13369,18 +14502,18 @@ Veuillez libérer de l&apos;espace disque et cliquer sur Ok.</translation>
         <translation>veut devenir ami(e) avec toi sur Retroshare</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Bonjour %1,&lt;br&gt;&lt;br&gt;%2 veut devenir ton ami(e) sur Retroshare.&lt;br&gt;&lt;br&gt;Répondre maintenant :&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Merci,&lt;br&gt;L&apos;équipe de Retroshare</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Enregistrer le message</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Le message n&apos;a pas été envoyé
@@ -13392,17 +14525,7 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Coller le lien Retroshare</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Ajouter à &quot;A&quot;</translation>
     </message>
@@ -13422,7 +14545,7 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Ajouter comme fichier recommandé</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Message d&apos;origine</translation>
     </message>
@@ -13432,21 +14555,21 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Pour</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Eléments envoyés</translation>
     </message>
@@ -13461,7 +14584,7 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Sur %1, %2 à écrit :</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Re :</translation>
     </message>
@@ -13471,30 +14594,30 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Tr :</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Souhaitez-vous envoyer ce message sans sujet ?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Veuillez inscrire au moins un destinataire.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Cci</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
@@ -13609,13 +14732,13 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Détails</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Ouvrir un fichier...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Fichiers HTML (*.htm *.html);;tous les fichiers (*)</translation>
     </message>
@@ -13635,7 +14758,7 @@ Désirez-vous enregistrer le message dans les brouillons?</translation>
         <translation>Exporter en PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Le message n&apos;a pas été envoyé.
@@ -13657,7 +14780,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Ajouter un fichier supplémentaire</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Salut,&lt;br&gt;je voudrais être ami avec vous sur RetroShare. &lt;br&gt;</translation>
     </message>
@@ -13681,24 +14804,28 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">Vous avez une invitation de la part d&apos;un ami</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Répondre maintenant :</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>De :</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>Noeuds amis</translation>
     </message>
@@ -13743,13 +14870,13 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Liste ordonnée (romain majuscule)</translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Remerciements, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Identité distante :</translation>
     </message>
@@ -13759,12 +14886,12 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>[Manquante]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Veuillez créer une identité pour signer vos messages distants, ou enlever de la liste de destinations les pairs distants.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Nom de noeud et id:</translation>
     </message>
@@ -13842,7 +14969,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Par défaut</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Un nouvel onglet</translation>
     </message>
@@ -13852,7 +14979,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Une nouvelle fenêtre</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Modifier le mot clé</translation>
     </message>
@@ -13875,7 +15002,7 @@ Voulez-vous enregistrer votre message ?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Sous :</translation>
     </message>
@@ -13883,7 +15010,7 @@ Voulez-vous enregistrer votre message ?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Message</translation>
     </message>
@@ -13911,7 +15038,7 @@ Voulez-vous enregistrer votre message ?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Fichiers recommandés</translation>
     </message>
@@ -13921,37 +15048,37 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Télécharger tous les fichiers recommandés</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Sujet : </translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>De :</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Pour :</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Cc :</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Cci :</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Mots clés :</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Répondre</translation>
     </message>
@@ -13973,7 +15100,7 @@ Voulez-vous enregistrer votre message ?</translation>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished">Suivant</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -13991,7 +15118,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>Envoyer invitation</translation>
     </message>
@@ -14043,7 +15170,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Confirmer %1 comme ami</translation>
     </message>
@@ -14053,12 +15180,12 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Ajouter %1 comme ami</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Pas de sujet</translation>
     </message>
@@ -14068,22 +15195,17 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14093,23 +15215,21 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
+        <source>Send invite?</source>
+        <translation type="vanished">Envoyer invitation ?</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Voulez-vous vraiment envoyer une invitation avec votre certificat ?</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Tout télécharger</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Imprimer le document</translation>
     </message>
@@ -14124,12 +15244,12 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Fichiers HTML (*.htm *.html);;tous les fichiers (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Toujours charger les images pour ce message</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Cacher le panneau pièce jointe</translation>
     </message>
@@ -14151,6 +15271,42 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Compose</source>
         <translation>Écrire</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Répondre au(x) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Répondre</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Répondre à tous les destinataires du(des) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Répondre à tous</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Transférer le(s) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Suivante</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Supprimer le(s) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Supprimer</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Imprimer le(s) message(s) sélectionné(s)</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14229,7 +15385,7 @@ Voulez-vous enregistrer votre message ?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Nouveau message</translation>
     </message>
@@ -14239,16 +15395,60 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Écrire</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Répondre au(x) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Répondre</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Répondre à tous les destinataires du(des) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Répondre à tous</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Transférer le(s) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Transférer</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Supprimer le(s) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Supprimer</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Imprimer le(s) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Imprimer</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Affichage</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Mots clés</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Boîte de réception</translation>
@@ -14278,17 +15478,21 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Corbeille</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Tous les messages :</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Dossiers</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Vue rapide</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Imprimer...</translation>
@@ -14298,6 +15502,26 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Print Preview</source>
         <translation>Aperçu avant impression</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Icônes uniquement</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Texte à coté des icônes</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Icônes avec texte</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Texte en dessous des icônes</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Définir le texte sous les icônes</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14319,7 +15543,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Faire suivre le(s) message(s)</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Sujet</translation>
     </message>
@@ -14329,7 +15553,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>De</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
@@ -14339,7 +15563,39 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Contenu</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Cliquer pour trier par fichiers attachés</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Cliquer pour trier par sujet</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Cliquer pour trier par lu</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Cliquer pour trier par expéditeur</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Cliquer pour trier par date</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Cliquer pour trier par mots clés</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Cliquer pour trier par suivi</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Transférer le(s) message(s) sélectionné(s)</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Rechercher sujet</translation>
     </message>
@@ -14348,11 +15604,6 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Search From</source>
         <translation>Rechercher de</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14379,14 +15630,14 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Rechercher pièces jointes</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt; &lt;p&gt;Retroshare a son propre système de messagerie interne. Vous pouvez en envoyer/recevoir vers/depuis les noeuds de vos amis connectés.&lt;/p&gt; &lt;p&gt;Il est aussi possible d&apos;envoyer des messages vers les Identités d&apos;autres personnes en utilisant le système de routage global. Ces messages sont toujours chiffrés et sont relayés par des noeuds intermédiaires jusqu&apos;à ce qu&apos;ils atteignent leur destination finale. &lt;/p&gt; &lt;p&gt;Les messages distants restent dans votre boite d&apos;envoi jusqu&apos;à ce qu&apos;un accusé de réception soit reçu.&lt;/p&gt; &lt;p&gt;De façon générale, vous pouvez utiliser les messages afin de recommander des fichiers à vos amis en y collant des liens de fichiers, ou recommander des noeuds amis à d&apos;autres noeuds amis, afin de renforcer votre réseau, ou envoyer du retour d&apos;information (feedback) au propriétaire d&apos;une chaîne.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Suivi</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14460,7 +15711,7 @@ Voulez-vous enregistrer votre message ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14474,7 +15725,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14489,33 +15740,38 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Brouillons</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Pour</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Il n&apos;y a pas de messages suivis. Suivre un message vous permettra de le retrouver plus facilement ultérieurement. Pour suivre un message, cliquez sur l&apos;étoile grise devant n&apos;importe quel message.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Aucun message système disponible.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Pour</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Cliquer pour trier par destinataire</translation>
+    </message>
+    <message>
+        <source>This message goes to a distant person.</source>
+        <translation type="vanished">Ce message va vers une personne distante.</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14523,6 +15779,26 @@ Voulez-vous enregistrer votre message ?</translation>
         <source>Total:</source>
         <translation>Total :</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Messages</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Cliquer pour trier par signature</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Ce message a été signé et la signature vérifiée</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Ce message a été signé mais la signature n&apos;a pas été vérifiée</translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">Ce message vient d&apos;une personne distante.</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14550,17 +15826,7 @@ Voulez-vous enregistrer votre message ?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">Sauvegarder image</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Coller comme texte brut</translation>
     </message>
@@ -14614,7 +15880,7 @@ Voulez-vous enregistrer votre message ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Développer</translation>
     </message>
@@ -14624,7 +15890,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Effacer le message</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation>depuis</translation>
     </message>
@@ -14659,10 +15925,18 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>Message(s) en attente</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
+    <message>
+        <source>Send invite?</source>
+        <translation type="vanished">Envoyer invitation ?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Voulez-vous vraiment envoyer une invitation avec votre certificat ?</translation>
+    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -14800,7 +16074,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation>ID du contact</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Suppression des clés inutilisées...</translation>
     </message>
@@ -14810,7 +16084,7 @@ Voulez-vous enregistrer votre message ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Nettoyer le trousseau</translation>
     </message>
@@ -14828,13 +16102,7 @@ Remarques : votre ancien trousseau sera sauvegardé.
 La suppression peut échouer lors de l&apos;exécution de plusieurs instances de Retroshare sur la même machine.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Info du trousseau</translation>
@@ -14870,13 +16138,18 @@ Par mesure de sécurité votre trousseau précédent à été sauvegardé sous f
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Incohérence des données dans le trousseau de clés. Il s&apos;agit très probablement d&apos;un bug. S&apos;il vous plaît contacter les développeurs.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>Exporter/créer un nouveau noeud</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Clés de confiance uniquement</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Chercher nom</translation>
     </message>
@@ -14886,12 +16159,12 @@ Par mesure de sécurité votre trousseau précédent à été sauvegardé sous f
         <translation>Chercher ID de pair</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>Détails du profil ...</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14900,6 +16173,13 @@ Reported error:</source>
 Erreur remontée :</translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Réseau</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14926,7 +16206,7 @@ Erreur remontée :</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14947,7 +16227,7 @@ Erreur remontée :</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Groupes</translation>
     </message>
@@ -14977,19 +16257,19 @@ Erreur remontée :</translation>
         <translation type="unfinished">Importer votre liste d&apos;amis en incluant les groupes</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished">Chercher ID</translation>
     </message>
@@ -14999,12 +16279,12 @@ Erreur remontée :</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished">Options d&apos;affichage</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15014,7 +16294,7 @@ Erreur remontée :</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Groupe</translation>
     </message>
@@ -15129,7 +16409,7 @@ Erreur remontée :</translation>
         <translation type="unfinished">Tout replier </translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Voulez-vous retirer ce noeud ?</translation>
     </message>
@@ -15139,7 +16419,7 @@ Erreur remontée :</translation>
         <translation type="unfinished">Désirez-vous supprimer cet ami ?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Terminé !</translation>
@@ -15254,7 +16534,11 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">Entrées du journal</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15269,7 +16553,11 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Tout effacer</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">C&apos;est un test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>Les plus récents en haut</translation>
     </message>
@@ -15279,12 +16567,21 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Les plus anciens en haut</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Fil d&apos;actualités&lt;/h1&gt; &lt;p&gt;Le fil d&apos;actualités affiche les derniers événements survenus dans votre réseau, triés selon le moment où vous les avez reçus. Cela vous donne un résumé de l&apos;activité de vos amis. Vous pouvez configurer les événements à afficher en cliquant sur &lt;b&gt;Options&lt;/ b&gt;.
+Les divers événements affichés sont : &lt;ul&gt; &lt;li&gt;Les tentatives de connexion (utile pour ajouter de nouveaux amis et savoir qui essaie de vous contacter) &lt;/li&gt; &lt;li&gt; Les nouveaux articles dans les chaînes et les forums&lt;/li&gt; &lt;li&gt;Les nouvelles chaînes et forums auxquels vous pouvez vous abonner&lt;/li&gt; &lt;li&gt;Les messages privés de vos amis &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="vanished">Journal</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15339,6 +16636,10 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Sécurité</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15360,6 +16661,10 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <source>Message</source>
         <translation>Message</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Tentative de connexion</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15376,6 +16681,10 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <source>Ip security</source>
         <translation>Sécurité IP</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">Journal</translation>
+    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -15386,6 +16695,10 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <source>Circles</source>
         <translation>Cercles</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Liens</translation>
+    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -15438,6 +16751,26 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <source>Chat rooms</source>
         <translation>Salons de tchat</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">Salons de tchat</translation>
+    </message>
+    <message>
+        <source>Count occurrences of my current identity</source>
+        <translation type="vanished">Compter les occurrences de mon identité actuelle</translation>
+    </message>
+    <message>
+        <source>Count occurrences of any of the following texts (separate by newlines):</source>
+        <translation type="vanished">Compter les occurrences de n&apos;importe lequel des textes suivants (séparés par des retours à la ligne) :</translation>
+    </message>
+    <message>
+        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
+        <translation type="vanished">Sélectionné, si l&apos;identité et le texte ci-dessus de même origine doivent être dans le même cas pour déclencher le comptage.</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="vanished">Sensible à la casse</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15513,16 +16846,24 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Désactiver toutes les notifications grille-pain temporairement</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Flux</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Zone de notification</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">Compter tous les messages non lus</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation>Phrase de passe requise</translation>
     </message>
@@ -15542,12 +16883,12 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>Mauvais mot de passe !</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Veuillez saisir votre phrase de passe Retroshare</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Extension/exécutable non enregistrée</translation>
     </message>
@@ -15562,7 +16903,19 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
         <translation>S&apos;il vous plaît vérifier votre horloge système.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Analyse des fichiers partagés...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Hachage fichier</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Enregistrement de l&apos;index des fichiers...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15573,19 +16926,17 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Titre inconnu</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Message chiffré</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Afin que les salons de tchat fonctionnent correctement, l&apos;heure de votre ordinateur doit être correcte. Veuillez vérifier que c&apos;est le cas (un possible décalage de plusieurs minutes a été détecté avec vos amis).</translation>
     </message>
@@ -15593,7 +16944,7 @@ au moins un contact n&apos;a pas été ajouté au groupe</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>En ligne</translation>
     </message>
@@ -15645,6 +16996,10 @@ Trafic faible : 10% du trafic standard et TODO : tous les transferts de fichiers
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Dialogue</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15710,6 +17065,10 @@ Trafic faible : 10% du trafic standard et TODO : tous les transferts de fichiers
         <source>This profile has signed your own profile key</source>
         <translation>Ce profil a signé votre propre clé de profil</translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Signatures de clé :</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15739,20 +17098,23 @@ p, li { white-space: pre-wrap; }
         <translation>Clé PGP</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation>Ces options s&apos;appliquent à tous les emplacement du profil :</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signer la clé d&apos;un ami est une façon d&apos;exprimer à vos autres amis votre confiance en cet ami. Cela les aide à décider, en se basant sur votre propre confiance, si ils doivent permettre des connexions depuis cette clé. Signer une clé est absolument facultatif et ne peut pas être défait, alors faites-le avec sagesse.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Signer la clé PGP</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15789,7 +17151,12 @@ p, li { white-space: pre-wrap; }
         <translation>Inclure les signatures</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare vérifie périodiquement les listes de votre ami pour trouver des fichiers parcourables correspondants à vos transferts, afin d&apos;établir un transfert direct. Dans ce cas, votre ami sait que vous téléchargez le fichier.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Pour empêcher ce comportement pour cet ami seulement, décochez cette boîte. Vous pouvez toujours exécuter un transfert direct si vous le demandez explicitement, par exemple en téléchargeant depuis la liste de fichiers de votre ami. Cet réglage est appliqué à tous les emplacements du même noeud.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -15803,6 +17170,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette option vous permet de télécharger automatiquement un fichier qui serait recommandé dans un message venant de ce noeud. Ceci peut être utilisé par exemple pour envoyer des fichiers entre vos propres noeuds. L&apos;option est appliquée à tous les emplacements du même noeud.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15835,21 +17206,21 @@ p, li { white-space: pre-wrap; }
         <translation>KO/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Erreur : impossible d&apos;obtenir les détails de ce contact.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>L&apos;algorithme de la clé fournie n&apos;est pas supporté par Retroshare
@@ -15870,7 +17241,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Attention: Dans vos Préférences de Fichiers, vous avez interdit le téléchargement direct pour tous.</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Le niveau de confiance est une façon d&apos;exprimer votre propre confiance en cette clé. Cela n&apos;est pas utilisé par le logiciel, ni partagé, mais cela peut être utile pour vous afin de vous rappeler les bonnes/mauvaises clés.</translation>
     </message>
@@ -15939,6 +17310,10 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Le mot de passe est peut-être incorrect</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15946,12 +17321,12 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>Profil Retroshare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Ceci est votre propre clé PGP, et elle a été signée par : </translation>
     </message>
@@ -15977,7 +17352,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Tchat</translation>
     </message>
@@ -15998,7 +17373,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
@@ -16038,7 +17413,7 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>Décalage&#xa0;temps &#xa0;:</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Écrire un message</translation>
     </message>
@@ -16052,6 +17427,10 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>Friend Connected</source>
         <translation>Ami connecté</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Tentative de connexion</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16090,13 +17469,17 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Contact inconnu</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Envoyer le message</translation>
     </message>
@@ -16148,6 +17531,10 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>Chat with this person as...</source>
         <translation>Tchater avec cette personne en tant que ...</translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">Envoyer un message à cette personne</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -16206,6 +17593,10 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Toute personne dans votre liste de contacts aura automatiquement une opinion positive si elle n&apos;est pas définie. Cela permet d&apos;augmenter automatiquement la réputation des nœuds utilisés.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
+        <translation type="vanished">Donner automatiquement l&apos;avis &quot;positif&quot; à mes contacts</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -16263,6 +17654,13 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Afin d&apos;empêcher les ID bannies supprimées de revenir parce qu&apos;ils sont utilisés dans, par ex. Forums ou canaux, les identités bannies sont conservées dans une liste pendant un certain temps. Après cela, ils sont &quot;effacés&quot; À partir de la liste d&apos;interdiction, et sera téléchargé à nouveau comme non autorisé s&apos;il est utilisé dans les forums, les salons de tchat, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulaire</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16270,11 +17668,23 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Photo</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Commentaire</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Résumé</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16335,6 +17745,14 @@ Attention: Dans vos Préférences de Fichiers, vous avez interdit le télécharg
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Ajouter un commentaire</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Ecrivez un commentaire...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16405,6 +17823,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Créer un album </translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Afficher l&apos;album</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16426,17 +17848,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diaporama</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Vos albums</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Albums abonnés</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Albums partagés</translation>
     </message>
@@ -16466,7 +17888,7 @@ avant de vouloir le modifier !</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Nom de l&apos;album</translation>
     </message>
@@ -16525,19 +17947,19 @@ avant de vouloir le modifier !</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16573,12 +17995,12 @@ avant de vouloir le modifier !</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Etiquette</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>sera activé aprés le redémarrage de Retroshare</translation>
     </message>
@@ -16724,6 +18146,60 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Dossiers des extensions</translation>
     </message>
+    <message>
+        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
+        <translation type="vanished">Plug-in désactivé. Cliquez le bouton &quot;activer&quot; puis redémarrez Retroshare</translation>
+    </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[désactivé]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Aucun numéro d&apos;API fourni. S&apos;il vous plaît lire le manuel de développement des extensions.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[problème de chargement]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Aucun numéro de SVN fourni. S&apos;il vous plaît lire le manuel de développement des extensions.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Erreur de chargement.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Symbole manquant. Mauvaise version ?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Pas d&apos;extension</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">L&apos;extension est chargée</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Statut inconnue.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Cochez cette case pour le développement des extensions. Elles ne seront pas
+vérifié par hachage. Toutefois, dans des conditions normales
+en vérifiant la valeur de hachage cela vous protège contre les
+comportements malveillants des extensions.</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Extensions&lt;/h1&gt; &lt;p&gt;Les extensions sont chargées depuis les répertoires affichés dans la liste tout en bas.&lt;/p&gt; &lt;p&gt;Pour des raisons de sécurité, les extensions reconnues sont chargées automatiquement, jusqu&apos;à ce que l&apos;exécutable principal Retroshare ou que de la bibliothèque de plug-in ne changent. Dans un tel cas, l&apos;utilisateur doit confirmer les plugins à nouveau. Après le démarrage du programme, vous pouvez activer un plugin manuellement en cliquant sur ​​le bouton &quot;Activer&quot; puis ensuite redémarrer Retroshare.&lt;/p&gt; &lt;p&gt;Si vous voulez développer vos propres extensions, contactez l&apos;équipe de développeurs, ils seront heureux de vous aider !&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16793,27 +18269,12 @@ p, li { white-space: pre-wrap; }
         <translation>Mettre la fenêtre sur le dessus</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">Bannir cette personne (met une opinion négative)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished">Donne opinion neutre</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished">Donne opinion positive</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16847,6 +18308,22 @@ p, li { white-space: pre-wrap; }
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The person you are talking to has deleted the secured chat tunnel.</source>
+        <translation type="vanished">La personne à laquelle vous parliez a supprimé le tunnel de tchat sécurisé.</translation>
+    </message>
+    <message>
+        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
+        <translation type="vanished">Le partenaire de tchat a supprimé le tunnel sécurisé, les messages seront livrés dès que possible.</translation>
+    </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">La fermeture de cette fenêtre met fin à la conversation, informez le contact puis supprimez le tunnel chiffré.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Tuer ce tunnel ?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16866,7 +18343,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nouveau</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Voter pour</translation>
     </message>
@@ -16886,8 +18363,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Commentaires</translation>
     </message>
@@ -16912,13 +18389,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Commentaire</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished">Commentaires</translation>
     </message>
@@ -16946,12 +18423,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Signé par :</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Notes</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>Retroshare</translation>
     </message>
@@ -16966,22 +18451,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Charger le fichier image</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16997,17 +18472,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17017,7 +18482,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Soumettre l&apos;article</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">Vous proposez un lien. La clé d&apos;une proposition réussie est un contenu intéressant et ayant un titre descriptif.</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Soumettre</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Soumettre un nouveau lien </translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Veuillez ajouter un titre</translation>
     </message>
@@ -17037,22 +18518,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17067,7 +18538,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Poster en tant que</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17078,7 +18549,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Image</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17088,7 +18559,7 @@ p, li { white-space: pre-wrap; }
         <translation>Titre</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Lien</translation>
     </message>
@@ -17096,12 +18567,44 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Liens publiés</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Liens&lt;/h1&gt; &lt;p&gt;Le service de publication vous permet de partager des liens internet, qui se propagent entre les nœuds Retroshare à la manière des forums et des chaînes&lt;/p&gt; &lt;p&gt;Les liens peuvent être commentés par les utilisateurs inscrits. Un système de promotion donne également la possibilité de mettre en avant les liens importants.&lt;/p&gt; &lt;p&gt;Il n&apos;y a aucune restriction concernant les liens qui sont partagés. Soyez prudent lorsque vous cliquez sur eux.&lt;/p&gt; &lt;p&gt;Les liens publiés sont conservés pour %1 jours et synchronisés au cours des derniers %2 jours, à moins que vous ne les modifiez.&lt;/p&gt; </translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Créer un sujet</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Vos sujets</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Sujets abonnés</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Sujets populaires</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Autres sujets</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Liens</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17135,7 +18638,31 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Sujet publié</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Ajouter des admins au sujet</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Selectionner les admins</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Créer un nouveau sujet</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Éditer le sujet</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Mettre à jour le sujet</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17173,17 +18700,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>Abonné à Posté</translation>
     </message>
@@ -17199,7 +18716,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Montrer</translation>
     </message>
@@ -17214,17 +18731,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">Description postée</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Chargement</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">Nouveau post</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">Jamais</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17237,18 +18761,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Site</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Commentaires</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17259,12 +18787,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Commentaire</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished">Commentaires</translation>
     </message>
@@ -17274,7 +18802,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L&apos;auteur de ce message (avec l&apos;ID %1) est banni.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17284,17 +18812,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Voter pour</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Voter contre</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Définir comme lu et supprimer l&apos;élément</translation>
     </message>
@@ -17304,7 +18836,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nouveau</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Nouveau commentaire&#xa0;:</translation>
     </message>
@@ -17314,7 +18846,7 @@ p, li { white-space: pre-wrap; }
         <translation>Valeur du commentaire</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -17355,10 +18887,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Chargement</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Par</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulaire</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Chaud</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nouveau</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Top</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Aujourd&apos;hui</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Hier</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Cette semaine</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Ce mois-ci</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Cette année</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Soumettre un nouveau lien</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Suivant</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Veuillez créer ou choisir une ID de signature avant de voter</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Précédent</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17378,17 +18977,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17398,15 +18987,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Administrateur :</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">inconnu</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished">Distribution :</translation>
     </message>
@@ -17416,42 +19005,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">Posts</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17468,10 +19057,10 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>Hot</source>
-        <translation type="unfinished">Hot</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17501,17 +19090,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17526,17 +19115,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Vide</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17546,31 +19130,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Modifier</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished">information</translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17585,7 +19165,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">S&apos;abonner</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">Jamais</translation>
     </message>
@@ -17659,16 +19239,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Aucune chaîne sélectionnée</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17677,6 +19247,14 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Ouvrir chaque sujet dans un nouvel onglet</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Liens</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17690,6 +19268,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Publié</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17758,17 +19340,25 @@ p, li { white-space: pre-wrap; }
         <translation>Gestionnaire de profil</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&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;
+&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;Ubuntu&apos;; font-size:11pt; 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;Sélectionnez une clé de noeud Retroshare depuis la liste ci-dessous afin de l&apos;utiliser sur un autre ordinateur, puis pressez &amp;quot;Exporter la clé sélectionnée.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Pour créer un nouvel emplacement sur un ordinateur différent, sélectionnez  le gestionnaire d&apos;identité dans la fenêtre de connexion (fenêtre de login). Depuis là vous pouvez importer le fichier clé puis créer une nouvel emplacement pour cette clé. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Créer un nouveau noeud avec la même clé permet à vos noeuds amis de vous accepter automatiquement.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -17879,7 +19469,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Modifier le message d&apos;état</translation>
@@ -17895,7 +19485,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>Gestionnaire de profil</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Information publique</translation>
     </message>
@@ -17930,12 +19520,12 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation>En ligne depuis :</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Autres informations</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Votre adresse</translation>
     </message>
@@ -17979,27 +19569,51 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Article de :</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Compte 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Compte 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Compte 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Ajouter a Pulse</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">filtre</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">Additionneur URL</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Afficher en tant que</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18009,12 +19623,12 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished">De :</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18044,13 +19658,13 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished">Négative</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18062,22 +19676,12 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18086,13 +19690,17 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Publier Pulse sur Wire</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18107,24 +19715,34 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Charger le fichier image</translation>
+        <source>From</source>
+        <translation type="vanished">De</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Date</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18135,7 +19753,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18154,7 +19772,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18164,7 +19782,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18191,7 +19809,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18201,7 +19819,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18221,7 +19839,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18337,7 +19955,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18345,42 +19963,37 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18412,7 +20025,7 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18420,8 +20033,8 @@ et utiliser le bouton d&apos;importation pour la charger</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Confirmation</translation>
     </message>
@@ -18691,12 +20304,12 @@ Les caractères &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; seront rem
         <translation>Détails du contact</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Demande de fichier annulée</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Cette version de Retroshare utilise OpenPGP SDK. En contre partie, elle n&apos;utilise plus le système de trousseau de clés PGP, mais possède son propre trousseau de clés partagé par toutes les instances de Retroshare. &lt;br&gt;&lt;br&gt; Vous ne semblez pas posséder un tel trousseau, bien que des clés PGP apparaissent pour les comptes Retroshare existants, probablement parce que vous venez d&apos;installer cette nouvelle version du logiciel.</translation>
     </message>
@@ -18727,7 +20340,7 @@ Les caractères &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; seront rem
         <translation>Une erreur inattendue s&apos;est produite. Vous pouvez la reporter &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation>Ne peut pas démarrer le Tor Manager !</translation>
     </message>
@@ -18765,7 +20378,7 @@ L&apos;erreur rapportée est : &quot;</translation>
         <translation>Il n&apos;était pas possible de démarrer un service caché.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Instances multiples</translation>
@@ -18787,26 +20400,6 @@ Fichier verrouillé :</translation>
  Fichier verrouillé :
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18827,6 +20420,14 @@ Fichier verrouillé :</translation>
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
+        <translation type="vanished">Le tunnel est en suspens ... Les messages seront livrés dès que possible</translation>
+    </message>
+    <message>
+        <source>Secured tunnel is working. Messages are delivered immediately!</source>
+        <translation type="vanished">Le tunnel sécurisé est en marche. Les messages sont livrés immédiatement !</translation>
+    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -18889,7 +20490,7 @@ L&apos;erreur rapportée est :
         <translation>Données transférées</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Vous semblez avoir des noeuds associés à vos clés DSA :</translation>
     </message>
@@ -18899,7 +20500,7 @@ L&apos;erreur rapportée est :
         <translation>Les clés DSA ne sont pas encore supportées par cette version de RetroShare. Tous ces noeuds seront inutilisables. Nous sommes vraiment désolés pour cela.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>activé</translation>
     </message>
@@ -18909,7 +20510,7 @@ L&apos;erreur rapportée est :
         <translation>désactivé</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Ajouter l&apos;IP %1 en liste blanche</translation>
     </message>
@@ -18925,7 +20526,7 @@ L&apos;erreur rapportée est :
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>%1 secondes avant</translation>
     </message>
@@ -18993,7 +20594,7 @@ Security: no anonymous IDs</source>
 Securité : pas d&apos;IDs anomymes</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation>Rejoindre le salon de tchat</translation>
     </message>
@@ -19021,7 +20622,7 @@ Securité : pas d&apos;IDs anomymes</translation>
         <translation>incapable de faire l&apos;analyse syntaxique (anglais: parse) du fichier XML !</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation>Indéfiniment</translation>
     </message>
@@ -19201,29 +20802,13 @@ Securité : pas d&apos;IDs anomymes</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Nom</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Noeud</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished">Adresse</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Statut</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19416,6 +21001,10 @@ Securité : pas d&apos;IDs anomymes</translation>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Ce certificat contient :</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19466,18 +21055,6 @@ Securité : pas d&apos;IDs anomymes</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19640,7 +21217,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Anonyme</translation>
     </message>
@@ -19823,7 +21400,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Le chargement des images intégrées est bloqué.</translation>
     </message>
@@ -19836,7 +21413,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Autorisé par défaut</translation>
     </message>
@@ -20009,22 +21586,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">Sauvegarder image</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20032,12 +21599,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation>Options d&apos;affichage d&apos;arborescence</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20067,6 +21634,14 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">Afficher la colonne...</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[pas de titre]</translation>
+    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -20729,7 +22304,7 @@ Si vous pensez qu&apos;il est correct, supprimez la ligne correspondante du fich
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nom</translation>
@@ -20850,7 +22425,7 @@ Si vous pensez qu&apos;il est correct, supprimez la ligne correspondante du fich
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Nom</translation>
     </message>
@@ -20870,7 +22445,7 @@ Si vous pensez qu&apos;il est correct, supprimez la ligne correspondante du fich
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20926,7 +22501,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished">Le message sera transmis à vos amis.</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Message rédigé ... ]</translation>
     </message>
@@ -20940,6 +22515,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[Inconnu]</translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Message manquant... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20953,11 +22533,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">De</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20980,18 +22555,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Cliquer pour trier par lu</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Cliquer pour trier par expéditeur</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21014,9 +22584,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21037,7 +22605,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Réinitialisation de tous les paramètres de Retroshare.</translation>
     </message>
@@ -21098,7 +22666,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Définit la langue de Retroshare.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Impossible d&apos;ouvrir le journal &apos;%1&apos;: %2</translation>
     </message>
@@ -21119,7 +22687,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation>N&apos;a pas pu créer le dossier de données : %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Révision</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21149,7 +22721,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Information concernant le GUI de Retroshare</translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>Le code de langue indiqué n&apos;est pas valide :</translation>
     </message>
@@ -21167,7 +22739,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Erreur d&apos;accès au registre. Peut-être vous avez besoin des droits d&apos;administrateur.</translation>
@@ -21184,12 +22756,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Entrez un mot clé ici (minimum 3 caractères)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Lancer la recherche</translation>
     </message>
@@ -21251,7 +22823,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Mots clés</translation>
     </message>
@@ -21266,7 +22838,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>ID de recherche</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Nom du fichier</translation>
     </message>
@@ -21366,23 +22938,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Télécharger la sélection</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Nom du fichier</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Copier le lien Retroshare</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Envoyer le lien Retroshare</translation>
     </message>
@@ -21392,7 +22964,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Télécharger la notice</translation>
     </message>
@@ -21429,7 +23001,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Tout supprimer</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Dossier</translation>
@@ -21440,17 +23012,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nouveau(x) lien(s) Retroshare</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Ouvrir répertoire</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Créer une collection ...</translation>
     </message>
@@ -21470,7 +23042,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Télécharger à partir d&apos;un fichier collection...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Collection</translation>
     </message>
@@ -21478,7 +23050,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Détails du pair</translation>
     </message>
@@ -21494,22 +23066,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Supprimer élément</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>Adresse IP :</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>ID du pair :</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Emplacement :</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Nom du pair :</translation>
     </message>
@@ -21526,7 +23098,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation>mais signalé :</translation>
     </message>
@@ -21551,8 +23123,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Ceci est l&apos;IP à laquelle votre ami prétend être connecté. Si vous avez juste changé d&apos;IPs, ceci est une fausse alerte. Sinon, cela signifie que votre connexion à cet ami est retransmise via un pair intermédiaire, ce qui serait suspect.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cet avertissement est ici pour vous protéger contre les attaques visant le traffic transféré. Dans un tel cas, l&apos;ami auquel vous êtes connecté ne verra pas votre IP externe, mais celle de l&apos;attaquant. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Cependant, si vous avez juste changé d&apos;IP pour quelque raison que ce soit (quelques fournisseurs d&apos;accès Internet forcent régulièrement le changement d&apos;IPs) cet avertissement vous informe juste qu&apos;un ami s&apos;est connecté à la nouvelle IP avant que Retroshare n&apos;aie compris que l&apos;IP avait changé. Dans ce cas tout va bien.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Vous pouvez facilement supprimer les fausses alertes en mettant en liste blanche vos propres IPs (par exemple la plage d&apos;adresses de votre votre fournisseur d&apos;accès Internet), ou en mettant complètement hors de service ces avertissements dans Options -&amp;gt; Notifications -&amp;gt; le Fil d&apos;actualités.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -21560,7 +23132,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>veut devenir ton ami(e) sur Retroshare</translation>
     </message>
@@ -21591,7 +23163,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Déplier</translation>
     </message>
@@ -21636,12 +23208,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Statut : </translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Envoyer un message</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Tentative de connexion</translation>
     </message>
@@ -21661,22 +23233,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Tentative de connexion (sortante) inconnue</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Problème de sécurité inconnue</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21686,7 +23253,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Contact inconnu</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
@@ -21696,7 +23267,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Désirez-vous supprimer cet ami ?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Ce certificat a une signature erronée ! Cette personne n&apos;est pas celle qu&apos;elle prétend être.</translation>
     </message>
@@ -21706,12 +23277,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Certificat manquant/endommagé. Ce n&apos;est pas un utilisateur réel de Retroshare.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>Ce certificat a provoqué une erreur interne.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Le pair/noeud n&apos;est pas dans la liste d&apos;amis (ID PGP=</translation>
     </message>
@@ -21770,12 +23341,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Adresse locale</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -21796,22 +23367,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port :</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Réseau local</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Découverte de l&apos;adresse IP externe</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>IPs connues / précédentes :</translation>
     </message>
@@ -21827,16 +23398,21 @@ que si vous vous connectez à quelqu&apos;un. Laisser cette case cochée vous ai
 derrière un pare-feu ou un VPN (virtual private network).</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Autoriser Retroshare à récupérer mon adresse IP à partir de ces sites :</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>Ko/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>La gamme de ports acceptables s&apos;étend de 10 à 65535. Normalement les ports en dessous de 1024 sont réservés à votre système.</translation>
     </message>
@@ -21846,46 +23422,23 @@ derrière un pare-feu ou un VPN (virtual private network).</translation>
         <translation>La gamme de ports acceptables s&apos;étend de 10 à 65535. Normalement les ports en dessous de 1024 sont réservés à votre système.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Adresse Onion</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Découverte activée (recommandé)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>Tor a été configuré automatiquement par Retroshare. Vous ne devriez rien avoir à changer ici.</translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Découverte désactivée</translation>
     </message>
@@ -21895,7 +23448,7 @@ List of found external IP:
         <translation>Caché - Voir config</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>Adresse I2P</translation>
     </message>
@@ -21920,95 +23473,39 @@ List of found external IP:
         <translation>entrant OK</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>Le proxy semble fonctionner.</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>proxy I2P non activé</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
+        <translation>BOB en cours d&apos;exécution et accessible</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
-        <translation type="unfinished"></translation>
+        <source>BOB is not accessible! Is it running?</source>
+        <translation>BOB n&apos;est pas accessible ! Est-il en cours d&apos;exécution ?</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare utilise BOB pour installer un tunnel %1 à %2: % 3 (nommé %4)
+
+Si vous modifiez des options (par exemple le port), utilisez les boutons du bas afin de redémarrer BOB.</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation>client</translation>
     </message>
@@ -22023,7 +23520,73 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>inconnu</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation>BOB traite une requête</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation>vérification de connectivité</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation>génération de clé</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation>démarrage</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation>en cours d&apos;arrêt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation>BOB traite une requête : %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation>BOB est cassé
+</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation>BOB a rencontré une erreur :
+</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation>Le tunnel BOB fonctionne</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation>BOB marche bien : tunnel établi</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation>Le tunnel BOB ne fonctionne pas</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation>BOB est inactif : tunnel fermé</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22033,7 +23596,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Vous êtes accessible à travers ce service caché.</translation>
     </message>
@@ -22047,12 +23625,12 @@ Tous les services sont-ils bien en marche ?
 Vérifiez aussi vos ports !</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Mode caché]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ceci vide la liste d&apos;adresses connues. Cette action est utile si, pour une raison quelconque, votre liste d&apos;adresse contient une adresse invalide/sans rapport/expirée que vous voulez éviter de passer à vos amis en tant qu&apos;adresse de contact.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22062,7 +23640,7 @@ Vérifiez aussi vos ports !</translation>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>Limite de téléchargement (KB/s)</translation>
     </message>
@@ -22077,23 +23655,23 @@ Vérifiez aussi vos ports !</translation>
         <translation>Limite d&apos;envoi (KB/s)</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La limite de téléversement (upload) concerne le logiciel entier. Une trop petite limite de téléversement pourrait éventuellement bloquer des services à basse priorité (forums, chaînes). La valeur minimum recommandée est 50 Ko/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22110,7 +23688,17 @@ Maintenant saisissez l&apos;adresse (ex: 127.0.0.1) et le port que vous avez cho
 Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noeud standard, alors pourquoi ne pas paramétrer Tor et/ou I2P ?</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation>Automatique I2P/BOB</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation>Permettre BOB dans I2P - modifier ceci exige un redémarrage pour prendre effet</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation>paramètres avancés permis</translation>
     </message>
@@ -22120,7 +23708,12 @@ Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noe
         <translation>mode avancé</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation>I2P Basic Open Bridge</translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation>Adresse d&apos;instance I2P</translation>
     </message>
@@ -22130,7 +23723,17 @@ Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noe
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation>Port du proxy I2P</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation>BOB accessible</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
@@ -22170,7 +23773,7 @@ Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noe
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
@@ -22185,7 +23788,12 @@ Vous pouvez vous connecter à des noeuds cachés, même si vous exécutez un noe
         <translation>Stopper</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation>Statut du BOB</translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation>Entrant</translation>
     </message>
@@ -22232,32 +23840,7 @@ Assurez-vous finalement que les Ports correspondent à la configuration.
 Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs de Tor aussi.</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation>Relais</translation>
     </message>
@@ -22312,7 +23895,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Total :</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation>Avertissement : cette bande passante s&apos;ajoute à la bande passante max.</translation>
     </message>
@@ -22337,7 +23920,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Supprimer serveur</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22349,7 +23932,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>Filtres d&apos;IP</translation>
     </message>
@@ -22372,7 +23955,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Statut</translation>
     </message>
@@ -22432,28 +24015,17 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Ajouter en liste blanche</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Configuration de service caché</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ceci est le port du proxy Socks de Tor. Votre noeud Retroshare peut utiliser ce port pour se connecter à &lt;/p&gt;&lt;p&gt;des noeuds cachés. La led à droite devient verte quand le port est actif sur votre ordinateur. &lt;/p&gt;&lt;p&gt;Ceci ne signifie pas cependant que votre traffic Retroshare traffic transite à travers Tor. Cela le signifie seulement si &lt;/p&gt;&lt;p&gt;vous vous connectez à des noeuds cachés, ou si vous exécutez vous-même un noeud caché.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette led est verte dans le port d&apos;écoute sur la gauche est active dans votre ordinateur. Cela ne signifie pas&lt;/p&gt;&lt;p&gt;que le traffic de votre Retroshare transite à travers Tor. Cela sera le cas seulement si&lt;/p&gt;&lt;p&gt;vous vous connectez à des noeuds cachés, ou si vous exécutez vous-même un noeud caché.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22469,18 +24041,18 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette led est verte dans le port d&apos;écoute sur la gauche est active dans votre ordinateur. Cela ne signifie pas&lt;/p&gt;&lt;p&gt;que le traffic de votre Retroshare transite à travers I2P. Cela sera le cas seulement si&lt;/p&gt;&lt;p&gt;vous vous connectez à des noeuds cachés, ou si vous exécutez vous-même un noeud caché.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P sortant OK</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Adresse de service</translation>
     </message>
@@ -22515,12 +24087,12 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Veuillez remplir par une adresse de service</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>Plage d&apos;IP</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Rapporté par la DHT concernant masquerading d&apos;IP (se fait passer pour).</translation>
     </message>
@@ -22543,22 +24115,22 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Ajouté par vous</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Les adresses IP de la liste blanche sont rassemblées depuis les sources suivantes : IPs venant à l&apos;intérieur d&apos;un certificat échangé manuellement, gammes IP entrées par vous dans cette fenêtre, ou dans les articles du flux de sécurité.&lt;/p&gt;&lt;p&gt;Le comportement par défaut de Retroshare est de (1) toujours permettre la connexion aux pairs ayant leur IP dans la liste blanche, même si cette IP est aussi présente dans la liste noire; (2) exiger facultativement que les IPs soient dans la liste blanche. Vous pouvez changer ce comportement pour chaque pair à partir de la fenêtre &amp;quot;Détails&amp;quot de chaque noeud Retroshare. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La DHT vous permet de répondre aux demandes de connexion de vos amis utilisant la DHT de BitTorrent. Elle améliore grandement la connectivité. Aucune informations ne sont stockées en réalité dans la DHT. Elle est seulement utilisé comme un système de proxy afin de se mettre en contact avec d&apos;autres noeuds Retroshare.&lt;/p&gt;&lt;p&gt;Le service de Découverte envoie le nom de noeud et les IDs de vos contacts éprouvés à vos pairs connectés, afin de les aider à choisir de nouveaux amis. L&apos;amitié n&apos;est cependant jamais automatique, et deux pairs doivent toujours avoir confiance l&apos;un en l&apos;autre pour permettre la connexion. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La balle devient verte aussitôt que Retroshare réussit à obtenir votre propre IP depuis les sites Web listés ci-dessous, si vous avez permis cette action. Retroshare utilisera aussi d&apos;autres moyens pour découvrir votre propre IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette liste est automatiquement remplie d&apos;informations rassemblées depuis des sources multiples : pairs en mode masquerading rapportés par la DHT, plages IP entrées par vous et plages IP rapportées par vos amis. Les réglages par défaut devraient vous protéger contre le relayage de trafic de grande échelle.&lt;/p&gt;&lt;p&gt;Devenir automatiquement les IPs employant le masquage peut avoir pour conséquence de placer vos IPs amies dans la liste noire. Dans ce cas, utilisez le menu de contexte afin de les mettre en liste blanche.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22593,22 +24165,26 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Bannir automatiquement de la DHT les plages auxquelles débutent les IP masquerading</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configurer ici votre proxy SOCKS Tor et I2P. &lt;br/&gt;Si vous préférez utiliser BOB afin qu&apos;il se débrouille automatiquement avec I2P, alors vérifiez l&apos;autre onglet.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Proxy Socks de Tor</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor sortant OK</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>Le proxy de Tor n&apos;est pas activé</translation>
     </message>
@@ -22688,7 +24264,7 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Visualiser les contacts avec qui vous partagez votre clé de publication privée</translation>
     </message>
@@ -22698,12 +24274,12 @@ Si vous avez des soucis concernant la connexion via Tor, pensez à lire les logs
         <translation>Partager avec vos amis</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Partager</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Vous pouvez laisser vos amis connaître vos chaînes en les partageant avec eux.
@@ -22723,7 +24299,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Gestionnaire des dossiers partagés</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation>Dossier partagé</translation>
     </message>
@@ -22743,17 +24319,17 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Visibilité</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation>Ajouter un nouveau</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Ajouter un dossier à partager</translation>
     </message>
@@ -22763,7 +24339,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Appliquer et fermer</translation>
     </message>
@@ -22854,7 +24430,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Le dossier n&apos;a pas été trouvé ou le nom du dossier n&apos;est pas accepté.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Il s&apos;agit d&apos;une liste des dossiers partagés. Vous pouvez ajouter et supprimer des dossiers en utilisant les boutons en bas. Lorsque vous ajoutez un nouveau dossier, initialement tous les fichiers contenus dans ce dossier sont partagés. Vous pouvez configurer séparément le type de partage pour chaque répertoire sélectionné.</translation>
     </message>
@@ -22862,7 +24438,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
@@ -22913,16 +24489,11 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>Vérifier vos fichiers</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Télécharger la sélection</translation>
     </message>
@@ -22932,7 +24503,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Télécharger</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Copier le lien Retroshare</translation>
     </message>
@@ -22947,7 +24518,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Envoyer le lien Retroshare</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation>Certains fichiers ont été omis</translation>
     </message>
@@ -22963,7 +24534,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Recommandation(s)</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Créer une collection ...</translation>
     </message>
@@ -22988,7 +24559,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Télécharger à partir d&apos;un fichier collection...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Certains fichiers ont été omis car leur hachage n&apos;est pas encore disponible.</translation>
     </message>
@@ -23131,12 +24702,12 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Chargement de la configuration</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Création de l&apos;interface</translation>
     </message>
@@ -23160,7 +24731,7 @@ Sélectionnez les amis avec lesquels vous voulez partager votre chaîne.</transl
         <translation>Se rappeler du mot de passe</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Se connecter</translation>
     </message>
@@ -23517,7 +25088,7 @@ Ce choix peut être inversé dans des paramétrages.</translation>
         <translation>Message d&apos;état</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Message :</translation>
     </message>
@@ -23762,7 +25333,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Supprimer tout les mots clés</translation>
     </message>
@@ -23798,15 +25369,12 @@ p, li { white-space: pre-wrap; }
         <translation>Paramétrage de Tor ...</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation>Statut de Tor :</translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
@@ -23816,13 +25384,18 @@ p, li { white-space: pre-wrap; }
         <translation>Non démarré</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
+        <translation>Adresse du service caché :</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation>Statut de l&apos;amorçage de Tor :</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation>Non défini</translation>
     </message>
@@ -23832,57 +25405,12 @@ p, li { white-space: pre-wrap; }
         <translation>Adresse Onion :</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Erreur</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Non connecté</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation>Vérification que Tor est accessible dans votre chemin d&apos;exécutables</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation>[En attente de Tor ...]</translation>
     </message>
@@ -23890,17 +25418,21 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Cette version de Retroshare utilise Tor pour se connecter à vos amis.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation>Tor est hors ligne actuellement</translation>
     </message>
@@ -23911,12 +25443,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Pas de configuration de Tor</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23944,7 +25475,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Options de transfert</translation>
@@ -23955,7 +25486,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum de téléchargements simultanés :</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation>Dossiers partagés</translation>
     </message>
@@ -23965,27 +25496,22 @@ p, li { white-space: pre-wrap; }
         <translation>Partager automatiquement le dossier de réception (recommandé)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation>Modifier le partage</translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished">Configurer les dossier partagés</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation>Vérifier automatiquement le partage toutes les :</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation> minute(s)</translation>
     </message>
@@ -24070,7 +25596,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24079,12 +25605,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24109,12 +25630,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -24173,13 +25689,38 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; est capable de transférer des fichiers et d&apos;effectuer des recherches entre personnes qui ne sont pas amies. Cependant, ce trafic se fait à travers une liste de contacts anonymes.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;Vous pouvez paramétrer le type de partage dans la fenêtre de partage de dossier :&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Visible par mes amis&lt;/span&gt;: les fichiers sont visibles par mes amis.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Partage anonyme&lt;/span&gt;: les fichiers sont accessibles anonymement par des tunnels F2F.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Nombre max. de requêtes de tunnels transmises par sec. :</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt; a pour conséquence que le transfert demande des morceaux de fichier de taille de 1 Mo en ordre croissant, ceci facilitant la prévisualisation lors du téléchargement. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; est purement aléatoire et favorise le comportement en essaimage. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressif&lt;/span&gt; est un compromis, choisissant le prochain morceau au hasard dans moins de 50 Mo après la fin du fichier partiel. Cela permet un certain aléatoire tout en empêchant des grands temps d&apos;initialisation de fichiers vides.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare suspendra tous les transferts et la sauvegarde de fichier de configuration si l&apos;espace disque descend en dessous de cette limite. Cela empêche la perte d&apos;informations sur certains systèmes. Une fenêtre contextuelle vous avertira si cela arrive.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24189,17 +25730,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cette valeur contrôle le nombre de requêtes de tunnels que votre pair peut transmettre par seconde.  &lt;/p&gt;&lt;p&gt; Si vous avez une grande bande passante, vous pouvez l&apos;augmenter jusqu&apos;à 30-40, pour permettre statistiquement aux tunnels plus long de passer. Soyez très prudent cependant, car cela génère de nombreux petits paquets qui peuvent considérablement ralentir le transfert de vos propres fichiers.  &lt;/p&gt;&lt;p&gt;La valeur par défaut est de 20. Si vous n&apos;êtes pas certain, gardez là ainsi.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Attention</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation>Spécifier le dossier des fichiers terminés</translation>
     </message>
@@ -24227,7 +25758,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Téléchargement terminé</translation>
     </message>
@@ -24251,23 +25782,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Vous avez %1 téléchargements terminés</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Vous avez %1 téléchargement terminé</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 téléchargements terminés</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 téléchargement terminé</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Téléchargements</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Envois</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nom</translation>
@@ -24474,7 +26021,11 @@ p, li { white-space: pre-wrap; }
         <translation>Spécifier...</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Partage de fichiers&lt;/h1&gt; &lt;p&gt;Retroshare utilise deux modes de transfert de fichiers : les transferts directs depuis vos amis, et les transferts distants anonymes par tunnels. En plus, le transfert de fichier est multi-source et permet l&apos;essaimage (vous pouvez être une source pendant le téléchargement) &lt;/p&gt; &lt;p&gt;Vous pouvez partager des fichiers en utilisant l&apos;icône &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; dans la barre latérale gauche. Ces fichiers seront listés dans l&apos;onglet &quot;Vos fichiers&quot;. Vous pouvez décider pour chaque groupe d&apos;amis s&apos;ils peuvent ou pas voir ces fichiers dans l&apos;onglet Mes amis&lt;/p&gt; &lt;p&gt;L&apos;onglet &quot;Rechercher&quot; liste les fichiers de vos amis et des fichiers distants qui peuvent être atteints anonymement en utilisant le système à effet tunnel à sauts multiples.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Mettre en file d&apos;attente...</translation>
     </message>
@@ -24499,7 +26050,7 @@ p, li { white-space: pre-wrap; }
         <translation>Choisir le répertoire</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Tunnel chiffré de bout en bout anonyme 0x</translation>
     </message>
@@ -24520,7 +26071,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24553,17 +26104,7 @@ p, li { white-space: pre-wrap; }
         <translation>Le fichier %1 n&apos;est pas terminé. Si c&apos;est un fichier multimédia, essayez de le prévisualiser.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Attention</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Changer le nom du fichier</translation>
     </message>
@@ -24578,7 +26119,7 @@ p, li { white-space: pre-wrap; }
         <translation>S&apos;il vous plaît entrez un nouveau--et valide--nomdefichier</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Tout déplier</translation>
@@ -24705,18 +26246,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Colonnes</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Transferts de fichiers</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Chemin</translation>
     </message>
@@ -24726,7 +26272,7 @@ p, li { white-space: pre-wrap; }
         <translation>Afficher la colonne des chemins</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>N&apos;a pas pu supprimer le fichier d&apos;aperçu</translation>
     </message>
@@ -24736,7 +26282,7 @@ p, li { white-space: pre-wrap; }
         <translation>Le réessayer ?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Créer une collection ...</translation>
     </message>
@@ -24751,12 +26297,7 @@ p, li { white-space: pre-wrap; }
         <translation>Vue collection ...</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+193"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Collection</translation>
     </message>
@@ -24766,7 +26307,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 tunnels</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Tunnel anonyme 0x</translation>
     </message>
@@ -24987,6 +26528,10 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">Tunnels anonymes</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25180,17 +26725,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Activer l&apos;interface WEB de Retroshare</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Paramètres web</translation>
     </message>
@@ -25224,33 +26764,27 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port:</source>
+        <translation type="vanished">Port:</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Interface WEB&lt;/h1&gt;       &lt;p&gt;L&apos;interface web vous permet de contrôler Retroshare à partir de votre navigateur. Plusieurs périphériques peuvent partager le contrôle d&apos;une instance Retroshare. Donc, vous pourriez commencer une conversation sur une tablette et utiliser plus tard un ordinateur de bureau pour la continuer.&lt;/p&gt;&lt;p&gt;Attention : ne pas exposer l&apos;interface web à l&apos;Internet, car il n&apos;y a aucun contrôle d&apos;accès et aucun chiffrement. Si vous voulez utiliser l&apos;interface web sur Internet, utiliser un tunnel SSH ou un proxy afin de sécuriser la connexion.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>Interface web non permise</translation>
     </message>
@@ -25260,12 +26794,12 @@ p, li { white-space: pre-wrap; }
         <translation>L&apos;interface web n&apos;est pas activée. Activez là via Options -&gt; Interface web.</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>échec de lancement de l&apos;interface web</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Interface web</translation>
     </message>
@@ -25402,7 +26936,11 @@ p, li { white-space: pre-wrap; }
         <translation>Pages Wiki</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Nouveau groupe</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Nom de la page</translation>
     </message>
@@ -25417,7 +26955,7 @@ p, li { white-space: pre-wrap; }
         <translation>Id d&apos;origine</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25505,7 +27043,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Historique des modifications de la page</translation>
     </message>
@@ -25540,7 +27078,7 @@ p, li { white-space: pre-wrap; }
         <translation>PageId</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25570,18 +27108,14 @@ p, li { white-space: pre-wrap; }
         <translation>Mots clés</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Historique</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Afficher l&apos;historique des modifications</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Statut</translation>
     </message>
@@ -25602,7 +27136,7 @@ p, li { white-space: pre-wrap; }
         <translation>Revenir</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Soumettre</translation>
     </message>
@@ -25674,6 +27208,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">TimeRange</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25685,7 +27223,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Rafraîchir</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25700,7 +27247,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Autres</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25720,7 +27267,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25750,17 +27297,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Mois dernier</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Semaine dernière</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Aujourd&apos;hui</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nouveau</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">De</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">jusqu&apos;à</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Rechercher/Filtrer</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Tout le réseau</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Gestionnaire de comptes</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Affichage :</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Moi</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Amis</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Following</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Personnalisé</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Compte 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Compte 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Compte 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">CheckBox</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Publier Pulse sur Wire</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25823,42 +27438,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulaire</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Emplacement :</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25903,41 +27511,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Following</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Inconnue</translation>
@@ -26015,7 +27593,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1a %2j</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26048,11 +27626,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Images (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26171,6 +27753,10 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> - </source>
+        <translation type="vanished"> - </translation>
+    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_hu.ts b/retroshare-gui/src/lang/retroshare_hu.ts
index d5967ea59..7ef052108 100644
--- a/retroshare-gui/src/lang/retroshare_hu.ts
+++ b/retroshare-gui/src/lang/retroshare_hu.ts
@@ -84,6 +84,13 @@
         <translation>Csak rejtett csomópont</translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Hozzászólás írása</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: Összetett keresés</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Keresési feltétel</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>További keresési feltétel hozzáadása.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Keresési feltételek törlése.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Keresés megszakítása.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Keresés</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Album létrehozása</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Album neve:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Kategória:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Állatok</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Család</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Barátok</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Virágok</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Vakáció</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Tájegységek</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Háziállatok</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Portrék</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Utazás</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Munka</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Véletlenszerű</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Képaláírás:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Helyszín:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fényképezte:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Leírás:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Megosztási beállítások</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Szabályok:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Minőség:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Hozzászólások:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Személyazonosság:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Publikus</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Korlátozott</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Képek átméretezése (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Képek átméretezése (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Eredeti képek küldése</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Hozzászólások letiltva</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Hitelesített hozzászólások</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Minden hozzászólás engedélyezve</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Küldés személyazonossággal</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Dobd be ide a képeket, majd kattints rájuk, hogy szerkeszd a részleteiket.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Vissza</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Fényképek hozzáadása</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Album közzététele</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Névtelen album</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Mondj valamit az albumról...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Ezek hol készültek?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Album bélyegkép betöltése</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Album</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Album bélyegkép</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Címke</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Összefoglalva</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>Képaláírás</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Helyszín:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Mikor</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Leírás:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Megosztási beállítások</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Hozzászólások</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Személyazonosság közzététele</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Láthatóság</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Vigyázat: Az itt látható szolgáltatások kísérleti jellegűek, viszont örömmel fogadjuk segítséged a tesztelésben. 
@@ -569,6 +783,14 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>Körök</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">Gxs fórumok</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">Gxs csatornák</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ p, li { white-space: pre-wrap; }
         <translation>Fényképek</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">Kép mentése</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -633,13 +842,17 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Avatár hozzáadása</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Avatár beállítása</translation>
     </message>
@@ -658,6 +871,10 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Avatár betöltése</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ p, li { white-space: pre-wrap; }
         <translation>Visszaállítás</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Fogadási arány</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Küldési arány</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Mindig felül</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stílus</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% átlátszóság</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Mentés</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Mégse</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Átvitel kezdete:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Beállítások elrejtése</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,7 +1063,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Hozzászólás</translation>
     </message>
@@ -852,12 +1093,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Az üzenet szerzője (azonosító: %1) bannolva van.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Szavazás mellette</translation>
     </message>
@@ -885,7 +1126,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Szavazás mellette</translation>
     </message>
@@ -943,7 +1184,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Megosztás</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Üzenet olvasottságának váltása</translation>
     </message>
@@ -983,7 +1224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Új</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -991,12 +1232,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Tetszik</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Avatár</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Lenyitás</translation>
     </message>
@@ -1042,12 +1283,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,17 +1457,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Csatornák</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Fülek</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Általános</translation>
     </message>
@@ -1236,17 +1477,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Letöltések</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Hozzászólások betöltése a háttérben (Fonál)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Minden egyes csatorna megnyitása új fülön</translation>
     </message>
@@ -1254,7 +1489,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1512,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Tetszik</translation>
     </message>
@@ -1302,18 +1537,18 @@ into the image, so as to
         <translation type="unfinished">Avatár</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Lenyitás</translation>
     </message>
@@ -1328,7 +1563,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
@@ -1338,7 +1573,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Hozzászólás</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished">Hozzászólások</translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Elrejt</translation>
     </message>
@@ -1346,7 +1591,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
@@ -1537,7 +1782,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Társalgószoba megjelenítése</translation>
     </message>
@@ -1549,6 +1794,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>Társalgószobák</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">%1 új üzeneted van</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">%1 új üzeneted van</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 új üzenet</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 új üzenet</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1570,14 +1831,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Ismeretlen szoba</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Összes eltávolítása</translation>
     </message>
@@ -1585,13 +1845,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Résztvevők száma</translation>
     </message>
@@ -1601,7 +1861,33 @@ into the image, so as to
         <translation>Téma</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>Feliratkozásaid: Privát társalgószobák</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>Feliratkozásaid: Nyilvános társalgószobák</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Privát társalgószobák</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Nyilvános társalgószobák</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Társalgószobák&lt;/h1&gt;                              	                      &lt;p&gt;A társalgószobák az IRC-hez hasonlóan működnek.                                      	                      Névtelen módon beszélgethetsz, anélkül, hogy fel kellene venned a személyeket barátnak.&lt;/p&gt;                    	                      &lt;p&gt;Egy társalgószoba lehet nyilvános (a barátaid látják) vagy privát (a barátaid nem látják, mindaddig míg nem hívod meg őket: &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Ha meghívnak egy privát szobába, akkor válik számodra láthatóvá, ha egy barátod is   	                      belépett az adott szobába.&lt;/p&gt;                                                                                               	                      &lt;p&gt;A bal oldali listában találhatók                                                                                     	                      azok a szobák, amikbe a barátaid bejelentkeztek. Továbbá                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Létrehozatsz új szobát Jobb klikkel&lt;/li&gt;                                                              		     &lt;li&gt;Dupla kattintással belépsz a szobába. Ekkor a szoba láthatóvá válik a további barátaid számára.&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Megjegyzés: A társalgószobák zökkenőmentes működéséhez nem árt ha pontos a számítógép órája. Vess rá egy pillantást!	                      &lt;/p&gt;                                      	                      </translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Társalgószoba létrehozása</translation>
     </message>
@@ -1611,7 +1897,7 @@ into the image, so as to
         <translation>Szoba elhagyása</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Hozz létre egy személyazonosságot, amely nem Álnév típusú és lépj be a szobába</translation>
     </message>
@@ -1670,12 +1956,12 @@ Kattints egy társalgószobára a bal oldali listában, hogy lásd a részleteke
 Kattints duplán egy társalgószobára a belépéshez.</translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 meghívott téged a %2 nevű társalgószobába</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Ehhez a társalgószobához válassz nyilvános felhasználónevet:</translation>
     </message>
@@ -1685,31 +1971,31 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Válassz személyazonosságot ehhez a szobához:</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Társalgószoba létrehozása</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Nincs téma beállítva]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Kiválasztott csevegőszoba adatai</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Privát</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Publikus</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>Névtelen azonosítók elfogadottak</translation>
     </message>
@@ -1719,25 +2005,42 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Automatikus feliratkozás megszüntetése</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Automatikus feliratkozás engedélyezése</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Társalgószobák keresése</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Név keresése</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Feliratkozva</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Oszlopok</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Igen</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Nem</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1749,47 +2052,47 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Társalgószoba neve:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>Társalgószoba azonosító:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Téma:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Típus:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Biztonság:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Partnerek:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Szövegcímke</translation>
     </message>
@@ -1804,24 +2107,13 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Névtelen azonosítók nem engedélyezettek</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Megjelenítés</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>oszlop</translation>
@@ -1835,7 +2127,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Eltávolítás</translation>
     </message>
@@ -1880,22 +2172,46 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Általános</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Távoli beszélgetés</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Mindenki</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Kapcsolatok</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Senki</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Titkosított távoli beszélgetés fogadása tőle:</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Beszélgetés beállításai</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Hangulatjelek engedélyezése Privát beszélgetésnél</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Hangulatjelek engedélyezése Csoportos beszélgetésnél</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Egyéni betűtípus engedélyezése</translation>
     </message>
@@ -1904,6 +2220,10 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Enable custom font size</source>
         <translation>Egyéni betűméret engedélyezése</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Minimális betűméret</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1915,7 +2235,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Dőlt betűk engedélyezése</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1940,7 +2260,11 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Beágyazott képek betöltése</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Társalgószoba</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Villogó ikon a fülön</translation>
     </message>
@@ -1949,6 +2273,10 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Do not send typing notifications</source>
         <translation>Ne küldjön értesítést arról, ha írok</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Privát beszélgetés</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1970,7 +2298,11 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Villogó ikon az ablakon/fülön</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Beszélgetés betűtípusa</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Beszélgetés betűtípusának megváltoztatása</translation>
     </message>
@@ -1980,10 +2312,14 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Beszélgetés betűtípusa:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Előzmények</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stílus</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1998,13 +2334,17 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Variant:</source>
         <translation>Változat:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Csoportos beszélgetés</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Privát beszélgetés</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation>Válassz betűtípust a Beszélgetéshez.</translation>
     </message>
@@ -2068,28 +2408,22 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Ezen a fülön beállíthatod, hogy a különböző típusú üzenetekből mennyit tároljon el a RetroShare a merevlemezen és hogy mennyi előző beszélgetést állítson vissza az aktuális ablakba. A maximális tárolási idő beállítása lehetővé teszi a régi üzenetek mellőzését, illetve segít megakadályozni, hogy az előzmények tele legyenek kevésbé fontos beszélgetésekkel (például egyes társalgószobák vagy távoli üzenetek előzményei). &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Társalgószobák</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Engedélyezve:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">Keresés</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2099,17 +2433,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Társalgószobák</translation>
@@ -2206,7 +2530,11 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Tárolási idő napokban (0=végtelen)</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Keresés alapértelmezései</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Kis- és nagybetű érzékeny</translation>
     </message>
@@ -2245,6 +2573,10 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Threshold for automatic search</source>
         <translation>Automatikus keresés küszöb</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Alapértelmezett személyazonosság a társalgószobákhoz:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2312,7 +2644,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Beszélgetés mutatása</translation>
     </message>
@@ -2348,7 +2680,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
@@ -2383,12 +2715,12 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation>Dőlt</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>Hangulatjel beillesztése</translation>
     </message>
@@ -2397,6 +2729,10 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Attach a Picture</source>
         <translation>Kép csatolása</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2468,6 +2804,11 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <source>Insert horizontal rule</source>
         <translation>Vízszintes vonalzó beillesztése</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Kép mentése</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2505,7 +2846,7 @@ Kattints duplán egy társalgószobára a belépéshez.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>éppen ír...</translation>
     </message>
@@ -2529,7 +2870,7 @@ a HTML átalakítás után.</translation>
         <translation>Válassz betütípust.</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Tényleg törölni akarod az előzményeket?</translation>
     </message>
@@ -2579,7 +2920,7 @@ a HTML átalakítás után.</translation>
         <translation>elfoglalt és valószínűleg nem fog válaszolni</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Kis- és nagybetű érzékenység szerinti keresés</translation>
     </message>
@@ -2601,7 +2942,7 @@ a HTML átalakítás után.</translation>
         <translation>Ne hagyd abba a színezést X elem megtalálása után (több CPU erőforrás szükséges)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Előző keresése &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2616,12 +2957,16 @@ a HTML átalakítás után.</translation>
         <translation>&lt;b&gt;Keresés &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Állapot)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Betűtípus és szín beállítása</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Fájl csatolása</translation>
     </message>
@@ -2637,12 +2982,12 @@ a HTML átalakítás után.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Kiválasztott szöveg megjelölése&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation>Személyazonosító</translation>
     </message>
@@ -2654,12 +2999,12 @@ Double click on it to add his name on text writer.</source>
 A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation>Aláiratlan</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>találat.</translation>
     </message>
@@ -2679,7 +3024,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Írj be egy üzenetet ide</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Ne állj le a színezéssel, miután</translation>
     </message>
@@ -2705,7 +3050,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Részletek megjelenítése:</translation>
     </message>
@@ -2727,7 +3072,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Személyes köreim</translation>
     </message>
@@ -2753,7 +3098,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Barátok</translation>
     </message>
@@ -2813,7 +3158,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Barátok barátai</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Külső körök (Admin)</translation>
     </message>
@@ -2829,7 +3174,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Körök</translation>
     </message>
@@ -2881,48 +3226,43 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Hiba: a partner adatai nem elérhetőek.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2934,7 +3274,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Titkosítás</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>Nem csatlakozott</translation>
     </message>
@@ -3016,17 +3356,25 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>nincs</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Ez a tanúsítvány tartalmaz:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;egy &lt;b&gt;csomópont azonosítót&lt;/b&gt; és &lt;b&gt;nevet&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">egy &lt;b&gt;onion címet&lt;/b&gt; és &lt;b&gt;portot&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">egy &lt;b&gt;IP címet&lt;/b&gt; és &lt;b&gt;portot&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Használd ezt a tanúsítványt, hogy új barátokat szerezz. Küldd el emailben, vagy juttasd el a címzettnek egyéb módon.&lt;/p&gt;</translation>
     </message>
@@ -3041,7 +3389,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ez az &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt; által használt titkosítási eljárás. Az összeköttetés a barátok csomópontjaihoz&lt;/p&gt;&lt;p&gt;mindig erősen titkosított és ha a DHE jelen van, akkor az összeköttetés további &lt;/p&gt;&lt;p&gt;&amp;quot;tökéletes továbbítási titkosítást&amp;quot;.&lt;/p&gt; használ.&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>­</translation>
     </message>
@@ -3058,16 +3406,118 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <source>Connect Friend Wizard</source>
         <translation>Barát hozzáadása varázsló</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Új barát hozzáadása</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Tanúsítvány fájl érkezett a barátodtól</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;Barátaim barátjainak felvétele barátként</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Email 
+ (Your friend will receive an email with instructions how to download RetroShare)</source>
+        <translation type="vanished">&amp;Küldj meghívót emailben 
+ (A címzett emailben kapja meg hogyan kell letölteni a Retroshare-t)</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Aláírásokat tartalmaz</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Tanúsítványod másolása a vágólapra</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Tanúsítványod mentése fájlba</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Levelező program indítása</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Ismerős tanúsítványának megnyitása fájlból</translation>
     </message>
+    <message>
+        <source>Open certificate</source>
+        <translation type="vanished">Tanusítvány megnyitása</translation>
+    </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">Kérlek illeszd be a barátod Retroshare tanúsítványát az alábbi mezőbe</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Tanúsítvány fájlok</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Fájlokba mentett PGP tanúsítványok használata.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Barát tanúsítványának importálása</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Készíttetned kell egy fájlt, ami tartalmazza a tanúsítványodat, majd ezt el kell juttatnod a barátodhoz. Természetesen használhatsz korábban készített fájlt is.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Tanúsítványom exportálása...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Dobd be ebbe az ablakba a barátod tanúsítványát, vagy add meg az elérési útját az alábbi mezőben</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Böngészés</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Barátok barátai</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Most válaszd ki, hogy kivel szeretnél baráti kapcsolatot létrehozni.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Mutasd</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Barátkozás velük</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare azonosító</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">RetroShare azonosító használata egy a hálózatodban elérhető barát felvételéhez.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Barát RetroShare azonosítójának megadása...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Illeszd be az alábbi mezőbe a barát RetroShare azonosítóját</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Írd be a barátod RetroShare azonosítóját! Pl.: Partner@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3109,7 +3559,27 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Barátok meghívása emailben</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Írd be a barátaid email címeit (különítsd el őket egy-egy pontosvesszővel)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">A barátaid email címei:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Írd be a barátaid email címeit</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Tárgy:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3125,32 +3595,78 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>A kérelem részletei</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Partner részletei</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Email:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Csomópont:</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">Kérlek vedd figyelembe, hogy a RetroShare sok sávszélességet, memóriát vagy CPU használatot igényel, ha túl sok barátot veszel fel. Természetesen annyi barátot vehetsz fel amennyit csak szeretnél, de 40-nél több barát felvétele esetleg túl sok 
+erőforrást igényel.</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">Ez a varázsló segít abban, hogy csatlakozhass a barát(ok)hoz a RetroShare hálózaton keresztül. &lt;br&gt;Válaszd ki, miként szeretnéd felvenni:</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Tanúsítvány beírása kézzel</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">RetroShare azonosító beírása kézzel</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">&amp;Küldés és meghívás webes email kiszolgálókon keresztül</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Ajánlj barátokat egymásnak</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">RetroShare tanúsítvány</translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">Kérlek illeszd be alább a barátod Retroshare tanúsítványát</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Tanúsítvány beillesztése</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A mezőbe a barátod Retroshare tanúsítványát illeszd be. FIGYELEM:  ez különbözik a barátod profil kulcsától. Ne illeszd be ide a barátod profil kulcsát (vagy annak egy részét), mert nem fog működni!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Barát hozzáadása a csoporthoz:</translation>
     </message>
@@ -3160,7 +3676,7 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>Barát azonosítása (PGP kulcs aláírása)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3185,22 +3701,16 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Barát hozzáadása</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">A baráti kérelem elfogadásához kattints a Kész gombra.</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Sajnálom, hiba történt</translation>
     </message>
@@ -3220,27 +3730,32 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
         <translation>A barátod részletei:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Kulcs érvényessége:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Aláírók</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;A barátod kulcsának aláírása alkalmas arra, hogy kifejezd a bizalmad iránta és ezt jelezd a többiek felé. Az aláírások kriptográfiailag bizonyítják, hogy az alábbi kulcsok hitelesnek ismerik el az aktuális PGP kulcsot.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>A személy már szerepel a barátlistádon. Az újbóli felvétele csak az IP címét fogja változtatni.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3286,17 +3801,49 @@ A nevet kettős kattintással hozzáadhatod a szövegszerkesztőhöz.</translati
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>A tanúsítvány betöltése sikertelen</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">A %1 PGP kulcshoz tartozó partner adatainak lehívása sikertelen</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Akárki, akit nem írtam alá</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Barátaim barátai, akik már megbíznak bennem</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Aláírt partnerek elutasítottként jelennek meg</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Partner neve</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Aláírva általa is</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Partner azonosító</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">Úgy tűnik, érvényes a tanúsítvány</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Érvénytelen Retroshare tanúsítvány!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare meghívás</translation>
     </message>
@@ -3318,12 +3865,12 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Ez a saját tanusítványod! Ugye nem saját magadat akarod ismerősként megadni?!</translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3331,7 +3878,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation>A kulcs már fenn van a megbízhatók listáján</translation>
     </message>
@@ -3371,7 +3918,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>Van egy barát felkérésed tőle</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3396,7 +3943,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3406,7 +3953,47 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Tanúsítvány betöltése sikertelen: nem található ez a fájl: %1</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Nem elérhető a hálózatodban %1 azonosítójú partner</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Új tanúsítvány formátum használata (biztonságosabb, robusztusabb)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Régi típusú tanúsítvány használata (visszafelé kompatibilis)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Aláírások eltávolítása</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">RetroShare meghívás</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Barát csatlakozása súgó</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Ezt a szöveget másolhatod, majd elküldheted a barátodnak emailben, illetve megoszthatod vele egyéb módon is.</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">A tanúsítványod a vágólapra lett másolva. Illeszd be és küld el a barátodnak emailben vagy oszd meg vele egyéb módon</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Mentés másként...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3445,7 +4032,11 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>*** Nincs ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Közvetlen forrásként használat, amikor lehetséges</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>IP-cím:</translation>
     </message>
@@ -3455,7 +4046,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>IP-cím:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Haladó beállítások megjelenítése</translation>
     </message>
@@ -3464,6 +4055,10 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;A barátod kulcsának aláírása alkalmas arra, hogy kifejezd a bizalmad iránta és ezt jelezd a többiek felé. Ez segíthet nekik eldönteni, hogy elfogadják-e a kapcsolódást az adott kulcs tulajdonosától. Egy kulcs aláírása csak egy lehetőség, de visszavonhatatlan. Ezért fontold meg és dönts okosan.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;A Retroshare időnként ellenőrzi a barátlistád kereshető fájlokért, melyek megegyeznek az átviteli fájlokkal, azért, hogy közvetlen fájlátvitel valósulhasson meg. Ebben az esetben a barátod tudni fogja, hogy letöltöd azt a fájlt.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Hogy elkerüld ezt a viselkedést, és ki szeretnéd hagyni ebből ezt a barátodat, akkor szüntesd meg a doboz kijelölését. Továbbra is lehetőséged lesz a fájl letöltésére tőle, ehhez azonban előbb igényelned kell azt. Például az adott fájl manuális letöltésével a barátod megosztott mappájából. Ez a beállítás egy adott csomóponthoz tartozó összes helyszínre érvényes lesz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3474,13 +4069,45 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Azon ismerősök, akiknél ez a beállítás szerepel, nem tudnak kapcsolódni, ha a címük hiányzik az engedélyezettek listájáról. Ez védelmet nyújt az adatforgalom-átirányítás jellegű támadásokkal szemben. Ha ez van beállítva, akkor az elutasított kapcsolatot a &amp;quot;biztonsági hírcsatorna tétel&amp;quot; a Hírcsatornába irányítja. Ott letilthatod vagy engedélyezheted az IP címüket. Ugyanazon csomópont összes helyszinére vonatkozik. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Barátaid ajánlása egymásnak</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Ajánlott barátok</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">Ez a személyes Retroshare tanúsítványod. Ezt kell eljuttatnod a barátaidhoz</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Üzenet:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Barátok ajánlása</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Címzett</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Kérlek, válassz ki az ajánláshoz legalább egy barátot.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Kérlek, válassz ki legalább egy barátot címzettnek.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Kulcs hozzáadása a kulcstartóhoz</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Ez a kulcs már szerepel a kulcstartódban</translation>
     </message>
@@ -3496,7 +4123,7 @@ távoli üzeneteket szeretnél küldeni ennek a partnernek,
  de nem veszed fel barátnak.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>A tanúsítvány verziója rossz. Kérlek vedd figyelembe, hogy a v0.6 és a v0.5 hálózatok nem kompatibilisek egymással.</translation>
     </message>
@@ -3531,7 +4158,7 @@ távoli üzeneteket szeretnél küldeni ennek a partnernek,
         <translation>IP hozzáadása a fehérlistához</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>Ez a tanúsítvány nem tartalmaz IP-t!</translation>
     </message>
@@ -3541,10 +4168,27 @@ távoli üzeneteket szeretnél küldeni ennek a partnernek,
         <translation>&lt;p&gt;Ez a tanúsítvány nem tartalmaz IP-t. A felfedezésre és a DHT-re vagy utalva, hogy megtaláld. Mivel fehérlistás engedélyezést kértél, ezért egy biztonsági figyelmeztetést fogsz kapni a Hírek fülön. Itt hozzáadhatod a partner IP-jét a fehérlistához.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished">[Ismeretlen]</translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Tanúsítvánnyal hozzáadva innen: %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Barát tanúsítványának beillesztése a Vágólapról</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Tanúsítvány betöltése sikertelen: nem olvasható az alábbi fájl: %1</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Tanúsítvány betöltése sikertelen: valami gond van ezzel: %1</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3606,7 +4250,7 @@ távoli üzeneteket szeretnél küldeni ennek a partnernek,
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>UDP kapcsolat létrehozása</translation>
     </message>
@@ -3634,7 +4278,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Kapcsolódási segéd</translation>
     </message>
@@ -3644,20 +4288,17 @@ p, li { white-space: pre-wrap; }
         <translation>Érvénytelen partner azonosító</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Ismeretlen állapot</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Kilépett</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Szimmetrikus NAT mögött</translation>
     </message>
@@ -3667,14 +4308,12 @@ p, li { white-space: pre-wrap; }
         <translation>NAT mögött, DHT nélkül</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Hálózat újraindítása</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>NAT mögött</translation>
     </message>
@@ -3684,8 +4323,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nincs DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>A hálózat elérhető!</translation>
     </message>
@@ -3710,7 +4348,7 @@ p, li { white-space: pre-wrap; }
         <translation>RS partnerek keresése</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>A felkutatáshoz DHT szükséges</translation>
     </message>
@@ -4002,7 +4640,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kérlek, próbáld meg újból importálni a tanúsítványt</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4010,8 +4648,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>Végrehajthatatlan továbbítás!</translation>
     </message>
@@ -4021,7 +4658,7 @@ p, li { white-space: pre-wrap; }
         <translation>Végrehajthatatlan továbbítás és nincs DHT</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Keresés</translation>
     </message>
@@ -4057,12 +4694,12 @@ p, li { white-space: pre-wrap; }
         <translation>Kör részletei</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A kör neve, a kapcsolattartó és a meghívott tagok listája látható lesz az összes meghívott számára. Ha a kör nem privát, akkor látható lesz a meghívott csomópontok szomszédos csomópontjai által is.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4082,7 +4719,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>Azonosító</translation>
     </message>
@@ -4102,18 +4739,18 @@ p, li { white-space: pre-wrap; }
         <translation>Szűrő</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Becenév</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Meghívott tagok</translation>
     </message>
@@ -4128,7 +4765,15 @@ p, li { white-space: pre-wrap; }
         <translation>Ismert személyek</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">Azonosító</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Típus</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
@@ -4168,19 +4813,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Csak a következő csoportok tagjai számára látható:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Kérlek, nevezd el a körödet</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Nincs korlátozás kiválasztva.</translation>
     </message>
@@ -4190,24 +4839,12 @@ p, li { white-space: pre-wrap; }
         <translation>Nincs határ kiválasztva.</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Ismeretlen]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Hozzáadás</translation>
     </message>
@@ -4217,7 +4854,7 @@ p, li { white-space: pre-wrap; }
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Keresés</translation>
@@ -4232,6 +4869,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Aláírt</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Ismert csomópontok által aláírva</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4248,6 +4889,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP Személyazonosság</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Névtelen azonosító</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4270,13 +4915,17 @@ p, li { white-space: pre-wrap; }
         <translation>Új kör létrehozása</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Létrehoz</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP-hez linkelt azonosító</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Tag hozzáadása</translation>
     </message>
@@ -4295,7 +4944,7 @@ p, li { white-space: pre-wrap; }
         <translation>Csoport létrehozása</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Csoport neve:</translation>
     </message>
@@ -4330,7 +4979,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Új bejegyzés a csatornán</translation>
     </message>
@@ -4340,7 +4989,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üzenet</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4401,11 +5050,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Dobáld be a fájlokat / Használd a fájl hozzáadása gombot új fájlok megosztásához.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Másolj/Illessz be RetroShare hivatkozásokat a megosztásaidból&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Melléklet csatolása</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Előnézeti kép hozzáadása</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Üzenet</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Tárgy:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4491,17 +5152,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4520,18 +5181,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">A fájl már hozzá van adva és hashelve van.</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Kérlek, adj meg egy tárgyat</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Előnézeti kép betöltése</translation>
     </message>
@@ -4546,12 +5206,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Adattömeg létrehozása</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Valóban generálni szeretnél %1 üzenetet ?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Fájlokat fogsz hozzáadni a megosztásodhoz. Biztos ezt szeretnéd tenni?</translation>
     </message>
@@ -4585,7 +5251,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Fórum üzenet beküldése</translation>
     </message>
@@ -4594,6 +5260,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Fórum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Tárgy</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4614,8 +5284,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4634,7 +5304,7 @@ p, li { white-space: pre-wrap; }
         <translation>Fájlokat az ablakba dobálva csatolhatsz</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4664,17 +5334,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Nincs fórum</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>Válasz</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Cím</translation>
     </message>
@@ -4728,7 +5398,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished">Kép betöltése</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>Nem kompatibilis azonosító ehhez a fórumhoz</translation>
     </message>
@@ -4738,8 +5408,8 @@ Törölni szeretnéd?</translation>
         <translation>Egyetlen személyazonosságod számára sem engedélyezett a hozzászólás ezen a fórumon. Ennek oka az lehet, hogy a fórum korlátozva van egy olyan körre, amely nem tartalmazza semelyik személyazonosságod, vagy pedig a fórum jelölők megkövetelik a PGP hitelesítésű azonosítókat.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Adattömeg létrehozása</translation>
     </message>
@@ -4748,6 +5418,10 @@ Törölni szeretnéd?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Valóban generálni szeretnél %1 üzenetet ? </translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Küldés</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4762,7 +5436,23 @@ Törölni szeretnéd?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Társalgószoba létrehozása</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">A társalgószoba egy központosítatlan, névtelen helyszín a beszélgetésekhez. Az összes résztvevő megkapja az összes üzenetet. A szoba létrehozása után meghívhatod abba barátaidat a barátlistádról.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Chatszoba neve:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">A szoba témája:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4797,7 +5487,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4807,7 +5497,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>PGP hitelesítésű azonosító megkövetelése</translation>
     </message>
@@ -4822,7 +5512,11 @@ Törölni szeretnéd?</translation>
         <translation>Válassz ki barátokat a csoportos beszélgetéshez.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Meghívott barátok</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Társalgószoba létrehozása</translation>
@@ -4843,7 +5537,7 @@ Törölni szeretnéd?</translation>
         <translation>Kapcsolatok:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Használandó személyazonosság: </translation>
     </message>
@@ -4851,17 +5545,17 @@ Törölni szeretnéd?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Publikus adatok</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
@@ -4871,12 +5565,12 @@ Törölni szeretnéd?</translation>
         <translation>Helyszín azonosító:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Alkalmazás verziója:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Online ettől kezdve:</translation>
     </message>
@@ -4896,7 +5590,12 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4906,7 +5605,7 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Egyéb adatok</translation>
     </message>
@@ -4916,12 +5615,17 @@ Törölni szeretnéd?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished">Profil</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Tanúsítvány</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4931,7 +5635,11 @@ Törölni szeretnéd?</translation>
         <translation>Aláírásokat tartalmaz</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Kulcs mentése fájlba</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Személyazonosság exportálása</translation>
     </message>
@@ -5003,33 +5711,33 @@ az importálás gombot, hogy betöltsd.</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Szövegcímke</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>PGP ujjlenyomat:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Csomópont információ</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP azonosító : </translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Barát csomópontok:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5068,6 +5776,14 @@ az importálás gombot, hogy betöltsd.</translation>
         <source>Node</source>
         <translation>Csomópont</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Új csomópont létrehozása...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">Statisztika megjelenítése</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5119,7 +5835,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5787,7 +6503,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Fájl indítása</translation>
     </message>
@@ -5795,38 +6511,38 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>neki</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>nagybetűk figyelmen kívül hagyása</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>yyyy.MM.dd</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5834,12 +6550,12 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Feltételek beállítása</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Feltétel törlése</translation>
     </message>
@@ -6001,7 +6717,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Kép</translation>
     </message>
@@ -6011,7 +6727,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Videó</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Hang</translation>
     </message>
@@ -6071,21 +6787,11 @@ az importálás gombot, hogy betöltsd.</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Barátok mappái</translation>
     </message>
@@ -6207,7 +6913,7 @@ az importálás gombot, hogy betöltsd.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation>Azonosító</translation>
     </message>
@@ -6242,6 +6948,10 @@ az importálás gombot, hogy betöltsd.</translation>
         <source>Show State</source>
         <translation>Állapot megjelenítése</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">Megbízható csomópontok</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6249,7 +6959,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Csoportok mutatása</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Csoport</translation>
     </message>
@@ -6285,7 +6995,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Hozzáadás a csoporthoz</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Keresés</translation>
@@ -6301,7 +7011,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Rendezés állapot szerint</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Profil részletek</translation>
     </message>
@@ -6545,7 +7255,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Baráti felkérés jóváhagyása</translation>
     </message>
@@ -6562,6 +7272,10 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Keresés:</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6583,7 +7297,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Barát keresése</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Jelöld mind</translation>
     </message>
@@ -6594,132 +7308,16 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Egyiket se jelöld</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Név</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished">Cím</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Állapot</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Barátság kezdeményezése</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Állapot szerkesztése</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Üzenőfal</translation>
     </message>
@@ -6802,38 +7400,33 @@ Also check your ports!</source>
         <translation>Alapértelmezett betűtípus visszaállítása</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Kulcstartó</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Hálózat&lt;/h1&gt;                                       &lt;p&gt;A Hálózat fül tartalmazza a barátaid Retroshare csomópontjait: pontosabban azokat a szomszédos Retroshare csomópontokat, akik kapcsolódtak hozzád.     &lt;/p&gt;                                                       &lt;p&gt;Csoportokba rendezheted őket, és így beállíthatod például azt, hogy mely csoportok férhessenek hozzá egy-egy fájlodhoz.&lt;/p&gt;     &lt;p&gt;Jobb oldalt 3 hasznos fület találsz:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Az Üzenőfal segítségével egyszerre küldhetsz üzenetet az összes csomópontnak&lt;/li&gt;                                   &lt;li&gt;A Hálózat gráf a felfedezés információit felhasználva megmutatja, hogy kikkel állasz kapcsolatban.&lt;/li&gt;                       &lt;li&gt;A Kulcstartóban találhatók az összegyűjtött csomópontok kulcsai, leginkább a barátiad csomópontjain keresztül jutnak el hozzád ezek a kulcsok.&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retroshare üzenőfal: az ide írt üzeneteidet az összes barátod láthatja.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Hálózat</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Hálózat gráf</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Add meg az állapotüzenetedet.</translation>
     </message>
@@ -6851,17 +7444,7 @@ Also check your ports!</source>
         <translation>Jelszó</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Az összes adatnak legalább 3 karakter hosszúnak kell lennie</translation>
     </message>
@@ -6871,12 +7454,17 @@ Also check your ports!</source>
         <translation>A jelszavak nem egyeznek</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation>Használj BOB-t</translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Ez egy PGP jelszó</translation>
@@ -6897,38 +7485,50 @@ Also check your ports!</source>
         <translation>Az új tanúsítványod létrehozása meghiúsult, talán rossz PGP jelszót adtál meg.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <source>Options</source>
+        <translation type="vanished">Beállítások</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation>PGP kulcs hossza</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Alap csomópont</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">TOR/I2P rejtett csomópont</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <source>Use existing profile</source>
+        <translation type="vanished">Meglévő profil használata</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Csomópont neve</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6948,12 +7548,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Profil mentése</translation>
     </message>
@@ -6963,43 +7563,42 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>Nyomás!</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation>Szövegcimke</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Haladó beállítások</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>rejtett cím</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7047,13 +7646,13 @@ Most már átmásolhatod egy másik számítógépre
         <translation>Hiba történt. A profilodat nem sikerült elmenteni.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Profil importálása</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Új profil és Retroshare csomópont létrehozása</translation>
     </message>
@@ -7063,7 +7662,7 @@ Most már átmásolhatod egy másik számítógépre
         <translation>Új Retroshare csomópont létrehozása</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation>Tor/I2P cím</translation>
     </message>
@@ -7098,7 +7697,7 @@ Most már átmásolhatod egy másik számítógépre
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7108,7 +7707,12 @@ Most már átmásolhatod egy másik számítógépre
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7118,7 +7722,12 @@ Most már átmásolhatod egy másik számítógépre
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation>I2P hivatkozás bekapcsolt BOB-val</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation>I2P hivatkozás címe</translation>
     </message>
@@ -7344,13 +7953,36 @@ Most már átmásolhatod egy másik számítógépre
         <translation>Első lépések</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Barátok meghívása</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;A RetroShare nem működhet barátok nélkül. Kattints a gombra a folyamat elindításához.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Küldj emailben egy meghívót a tanúsítványoddal együtt a barátaidnak.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Gondoskodj róla, hogy te is megkapd az ő tanúsítványukat... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Csak akkor csatlakozhattok a barátoddal egymáshoz, ha már mindketten felvettétek a másikat.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Barátaid hozzáadása a RetroSharehez</translation>
     </message>
@@ -7360,103 +7992,95 @@ Most már átmásolhatod egy másik számítógépre
         <translation>Barát hozzáadása</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Csatlakozás a barátokhoz</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Haladó: Port nyitása a tűzfalon</translation>
-    </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Csatlakozás a barátokhoz</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&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;
+&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:12pt;&quot;&gt;Mikor a barátaid meghívót küldenek, kattints rá, hogy megnyisd a Barátok hozzáadása ablakot.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Illeszd be az abalakba a barátaid tanúsítványait és vedd fel őket!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Haladó: Port nyitása a tűzfalon</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>További segítség és támogatás</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>RetroShare weboldal megnyitása</translation>
     </message>
@@ -7481,7 +8105,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visszajelzés emailben</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare meghívás</translation>
     </message>
@@ -7531,12 +8155,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare visszajelzés</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>RetroShare támogatás</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Sok funkciója van, többek között beépített társalgó és üzenetküldő.</translation>
     </message>
@@ -7660,7 +8284,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Csoportos beszélgetés mutatása</translation>
     </message>
@@ -7668,7 +8292,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[Ismeretlen]</translation>
     </message>
@@ -7838,7 +8462,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Cím</translation>
     </message>
@@ -7851,12 +8475,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Leírás</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7881,7 +8505,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">Csökkenő sorbarendezés</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">Növekvő sorbarendezés</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">Rendezés név szerint</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Rendezés népszerűség szerint</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Rendezés utolsó üzenet szerint</translation>
+    </message>
+    <message>
+        <source>Sort by Number of Posts</source>
+        <translation type="vanished">Bejegyzések száma szerinti rendezés</translation>
+    </message>
+    <message>
+        <source>Sort by Unread</source>
+        <translation type="vanished">Olvasatlanság szerinti rendezés</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7896,14 +8548,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Azonosító</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Utolsó bejegyzés</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
@@ -7914,13 +8566,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Soha</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Megjelenítés beállításai</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7933,7 +8589,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>és</translation>
     </message>
@@ -8069,7 +8725,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Csatornák</translation>
@@ -8080,22 +8736,22 @@ p, li { white-space: pre-wrap; }
         <translation>Csatorna létrehozása</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Automatikus letöltés engedélyezése</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Csatornáim</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Feliratkozások</translation>
     </message>
@@ -8115,12 +8771,12 @@ p, li { white-space: pre-wrap; }
         <translation>Válassz a csatornához letöltési könyvtárat</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Automatikus letöltés tiltása</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>Állítsd be a letöltési könyvtárat</translation>
     </message>
@@ -8155,22 +8811,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Lejátszás</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Mappa megnyitása</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
@@ -8190,17 +8846,17 @@ p, li { white-space: pre-wrap; }
         <translation>Ellenőrzés</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>A mappa nem nyitható meg</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Fájl lejátszása</translation>
     </message>
@@ -8210,10 +8866,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nem található %1 fájl</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Forma</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Fájlnév</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Méret</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Cím</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Közzétéve</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Állapot</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Új csatorna létrehozása</translation>
     </message>
@@ -8251,19 +8934,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Feliratkozás a csatornára</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8277,7 +8950,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -8292,7 +8965,7 @@ p, li { white-space: pre-wrap; }
         <translation>Csatorna leírása</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Töltés</translation>
     </message>
@@ -8307,9 +8980,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">Soha</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Új csatorna</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8320,7 +8992,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Új hozzászólás:</translation>
     </message>
@@ -8341,7 +9013,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Lejátszás</translation>
     </message>
@@ -8397,24 +9069,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Fájlok</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Vigyázz! A fájl törlődni fog kevesbb, mint %1 óra %2 perc múlva. Ha menteni szeretnéd, tedd meg időben.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Hozzászólás</translation>
     </message>
@@ -8429,17 +9105,21 @@ p, li { white-space: pre-wrap; }
         <translation>Nem tetszik</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Töltés</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation>Hozzászólások</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8464,16 +9144,115 @@ p, li { white-space: pre-wrap; }
         <translation>Média lejátszása</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Új bejegyzés</translation>
+    </message>
+    <message>
+        <source>Add new post</source>
+        <translation type="vanished">Új hozzászólás</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Töltés</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Keresés a csatornákban</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Cím</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Cím keresése</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Üzenet</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Üzenet keresése</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Fájlnév</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Keresés a fájlok között</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Nincs csatorna kiválasztva</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Soha</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Nyilvános</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Automatikus letöltés tiltása</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Automatikus letöltés engedélyezése</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Mutasd a fájlokat</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Adminisztrátor:</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Utolsó bejegyzés</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">ismeretlen</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Megosztás</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Hírcsatornák</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Fájlok</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Feliratkozottak</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Leírás:</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Új bejegyzés</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished">Új hozzászólás</translation>
     </message>
@@ -8543,7 +9322,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8579,7 +9358,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Hozzászólások</translation>
     </message>
@@ -8594,13 +9373,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Hírcsatornák</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8615,7 +9394,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8630,7 +9409,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8690,22 +9469,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8780,13 +9549,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Feliratkozva</translation>
     </message>
@@ -8837,17 +9605,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8867,11 +9635,19 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Tétel törlése</translation>
     </message>
+    <message>
+        <source>for identity </source>
+        <translation type="vanished">előle: </translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Tagsági kérelem jóváhagyása</translation>
     </message>
+    <message>
+        <source>Revoke membership request</source>
+        <translation type="vanished">Tagsági kérelem visszavonása</translation>
+    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -8962,7 +9738,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Hozzászólás a tárolóhoz</translation>
     </message>
@@ -8975,7 +9751,7 @@ p, li { white-space: pre-wrap; }
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9005,7 +9781,7 @@ p, li { white-space: pre-wrap; }
         <translation>Frissítés</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Hozzászólás</translation>
@@ -9044,7 +9820,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Válasz a hozzászólásra</translation>
     </message>
@@ -9068,21 +9844,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Szavazás ellene</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9092,7 +9853,7 @@ p, li { white-space: pre-wrap; }
         <translation>Hozzászólás írása</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9121,10 +9882,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Hozzászólás&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Aláírva általa</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9153,7 +9930,7 @@ before you can comment</source>
 mielőtt hozzászólhatsz</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9195,6 +9972,14 @@ mielőtt hozzászólhatsz</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Fórum adminisztrátorok hozzáadása</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Fórum adminisztrátorok kiválasztása</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9204,7 +9989,7 @@ mielőtt hozzászólhatsz</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Feliratkozás a fórumra</translation>
     </message>
@@ -9220,7 +10005,7 @@ mielőtt hozzászólhatsz</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -9240,9 +10025,8 @@ mielőtt hozzászólhatsz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Töltés</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9273,13 +10057,13 @@ mielőtt hozzászólhatsz</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Tárgy:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Leiratkozás a fórumról</translation>
     </message>
@@ -9290,7 +10074,7 @@ mielőtt hozzászólhatsz</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -9310,17 +10094,21 @@ mielőtt hozzászólhatsz</translation>
         <translation>Válasz címzettje:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Töltés</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
@@ -9333,66 +10121,63 @@ mielőtt hozzászólhatsz</translation>
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Új fonál indítása a kiválasztotta fórumban</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Fórumok keresése</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Utolsó beküldés</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation>Új szál</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Fa nézet</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Egyszerű nézet</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Cím</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Szerző</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Kép mentése</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Töltés</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9402,7 +10187,12 @@ mielőtt hozzászólhatsz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Válasz az üzenetre</translation>
     </message>
@@ -9426,6 +10216,10 @@ mielőtt hozzászólhatsz</translation>
         <source>Download all files</source>
         <translation>Összes fájl letöltése</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Következő olvasatlan</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9442,23 +10236,31 @@ mielőtt hozzászólhatsz</translation>
         <translation>Szerző keresése</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Tartalom</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Tartalom keresése</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Nincs név</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Válasz</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9501,12 +10303,20 @@ mielőtt hozzászólhatsz</translation>
         <translation>RetroShare hivatkozás másolása</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Lenyitás</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Letiltva]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[ismeretlen]</translation>
     </message>
@@ -9536,8 +10346,8 @@ mielőtt hozzászólhatsz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9551,6 +10361,26 @@ mielőtt hozzászólhatsz</translation>
         <source>Anti-spam</source>
         <translation>Szemétszűrő</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Szerkesztett üzenet ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Névtelen</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">aláírt</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">nincs</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Hiányzó üzenet ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9620,12 +10450,16 @@ mielőtt hozzászólhatsz</translation>
         <translation>Eredeti üzenet</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation>Új szál</translation>
     </message>
     <message>
-        <location line="+331"/>
+        <source>Read status</source>
+        <translation type="vanished">Elolvasott / nem olvasott</translation>
+    </message>
+    <message>
+        <location line="+318"/>
         <source>Edit</source>
         <translation>Szerkesztés</translation>
     </message>
@@ -9686,7 +10520,7 @@ mielőtt hozzászólhatsz</translation>
         <translation>Szerző megitélése</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9706,7 +10540,7 @@ mielőtt hozzászólhatsz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9758,7 +10592,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9768,7 +10602,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9783,7 +10617,17 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <source>Information for this identity is currently missing.</source>
+        <translation type="vanished">A személyazonossághoz tartozó információ jelenleg hiányzik.</translation>
+    </message>
+    <message>
+        <source>You have banned this ID. The message will not be
+displayed nor forwarded to your friends.</source>
+        <translation type="vanished">Tiltottad ezt az azonosítót. Az üzenet nem lesz
+megjelenítve és nem lesz továbbítva a barátaid számára.</translation>
+    </message>
+    <message>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation>(Legutóbbi)</translation>
     </message>
@@ -9849,12 +10693,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Fórum</translation>
@@ -9885,16 +10729,35 @@ This message is missing. You should receive it later.</source>
         <translation>Egyéb fórumok</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Várakozás</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Lekérdezés</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Töltés</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Ikon hozzáadása</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Kulccsal rendelkező személyek írhatnak a korlátozott csoportokban és olvashatják, valamint írhatnak a privát csatornákra is.</translation>
     </message>
@@ -9903,14 +10766,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Közzétételi kulcs megosztása</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">Jelöld ki azon partnereidet, akikkel szeretnél privát kulcsot megosztani.</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Kulcs megosztása velük:</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Leírás</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Üzenet elosztás</translation>
     </message>
@@ -9918,7 +10789,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Publikus</translation>
     </message>
@@ -9937,6 +10808,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Új fonál</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Szükséges</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Titkosított üzenetek</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9978,7 +10857,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Hozzászólások</translation>
     </message>
@@ -10001,7 +10880,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10017,12 +10896,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10039,23 +10918,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>Üzenet követése</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>PGP hitelesítés szükséges</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Soha</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10071,28 +10950,22 @@ This message is missing. You should receive it later.</source>
         <translation>Kérlek, adj meg egy nevet</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>Szükség van PGP aláírásra egy ismert azonosítótól</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Csoport logó betöltése</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Tulajdonos</translation>
     </message>
@@ -10102,12 +10975,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Információ</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>Azonosító</translation>
     </message>
@@ -10117,7 +10990,7 @@ This message is missing. You should receive it later.</source>
         <translation>Utolsó beküldés</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10192,12 +11065,7 @@ This message is missing. You should receive it later.</source>
         <translation>Aláíratlan és ismeretlen csomóponthoz tartozó azonosítók eltávolítása a kedvencek közül</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Népszerűség</translation>
     </message>
@@ -10213,22 +11081,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Szerző</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>Gxs azonosító címke</translation>
     </message>
@@ -10236,7 +11109,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Töltés</translation>
     </message>
@@ -10296,7 +11169,7 @@ This message is missing. You should receive it later.</source>
         <translation>Részletek szerkesztése</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation>Add meg a szinkronizálandó elmúlt időtartamot...</translation>
     </message>
@@ -10353,12 +11226,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <source>Share publish permissions</source>
+        <translation type="vanished">Nyilvános engedélyek megosztása</translation>
+    </message>
+    <message>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare hivatkozás másolása</translation>
     </message>
@@ -10381,7 +11258,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Nincs aláírás</translation>
     </message>
@@ -10394,24 +11271,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Töltés</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Nem található</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Nincs aláírás</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Letiltva]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Azonosítás</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>ismeretlen kulcs</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">névtelen</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10421,12 +11314,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Személyazonosság&amp;nbsp;név</translation>
     </message>
@@ -10446,14 +11334,6 @@ This message is missing. You should receive it later.</source>
         <translation>[Ismeretlen]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10465,7 +11345,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10513,13 +11393,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Ismeretlen]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Töltés</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10651,6 +11535,10 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation>Népszerüség</translation>
     </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Részletek</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -10683,6 +11571,33 @@ This message is missing. You should receive it later.</source>
         <translation>Nem</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">Azonosított csatornák</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">Alagút azonosító: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">állapot: %1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">elküldve: %1 byte</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">fogadva: %1 byte</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Ismeretlen kapcsolat</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10895,12 +11810,48 @@ This message is missing. You should receive it later.</source>
         <source>About</source>
         <translation>Névjegy</translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;A RetroShare egy Nyílt Forrású platformok közötti, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;privát és biztonságos decentralizált kommunikációt nyújtó szolgáltatás.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Segítségével biztonságosan oszthatod meg a barátlistádat, mert &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;egy megbízhatósági hálózat: &quot;web-of-trust&quot; által hitelesíti a partnereket és OpenSSL használatával titkosít minden kommunikációt.  &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;A RetroShare lehetőséget biztosít fájlmegosztásra, beszélgetésre, üzenetküldésre valamint csatornák használatára&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Hasznos linkek további információhoz:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Weboldal&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Fórum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Projekt Oldala&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Csapat Blogja&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Fejlesztői Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+37"/>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10916,7 +11867,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Szerzők</translation>
     </message>
@@ -10935,7 +11886,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11013,12 +11964,12 @@ p, li { white-space: pre-wrap; }
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+121"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+158"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11033,7 +11984,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11042,12 +11993,32 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Did you receive a certificate from a friend?</source>
+        <translation type="vanished">Kaptál egy tanúsítványt egy barátodtól?</translation>
+    </message>
+    <message>
+        <source>Add friends certificate</source>
+        <translation type="vanished">Ismerősök tanusítványainak hozzáadása.</translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">Tanusítvány-fájl hozzáadása</translation>
+    </message>
+    <message>
+        <source>Share your RetroShare Key</source>
+        <translation type="vanished">Saját RetroShare kulcsod megosztása</translation>
+    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
+        <translation type="vanished">Az alábbi szöveghalmaz a te RetroShare tanusítványod. Küld el a barátaidnak.</translation>
+    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -11058,12 +12029,20 @@ privát és biztonságos decentralizált kommunikációt nyújtó szolgáltatás
 </translation>
     </message>
     <message>
-        <location line="+134"/>
+        <source>Launch startup wizard</source>
+        <translation type="vanished">Nyisd meg az indító varázslót</translation>
+    </message>
+    <message>
+        <source>Do you need help with RetroShare?</source>
+        <translation type="vanished">Segítségre van szükséged?</translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>Open Web Help</source>
         <translation>Nyisd meg a segítség honlapot</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Tanúsítványod másolása a vágólapra</translation>
     </message>
@@ -11073,7 +12052,7 @@ privát és biztonságos decentralizált kommunikációt nyújtó szolgáltatás
         <translation>Mentsd el egy fájlba a tanusítványodat</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>Küld el emailben</translation>
     </message>
@@ -11093,37 +12072,13 @@ privát és biztonságos decentralizált kommunikációt nyújtó szolgáltatás
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11135,12 +12090,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11155,7 +12110,12 @@ new short format</source>
         <translation>RetroShare meghívó</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation>Mentés mint...</translation>
     </message>
@@ -11420,14 +12380,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Összes</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Népszerűség</translation>
     </message>
@@ -11437,12 +12397,12 @@ p, li { white-space: pre-wrap; }
         <translation>Keresés</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>Névtelen azonosító</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Új személyazonosság létrehozása</translation>
     </message>
@@ -11452,7 +12412,7 @@ p, li { white-space: pre-wrap; }
         <translation>Hozz létre új kört</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>Személyek</translation>
     </message>
@@ -11467,27 +12427,27 @@ p, li { white-space: pre-wrap; }
         <translation>Személy</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation>Letiltási opció:</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Automatikusan bannolj minden Személyazonosságot amelyet ugyanez a csomópont írt alá</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation>Ismerős szavazatai:</translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Elismerő szavazatok</translation>
     </message>
@@ -11503,39 +12463,29 @@ p, li { white-space: pre-wrap; }
         <translation>Bíráló szavazatok</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation>Használati statisztika</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Körök</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Kör neve</translation>
     </message>
@@ -11555,20 +12505,18 @@ p, li { white-space: pre-wrap; }
         <translation>Személyes körök</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Személyazonosság szerkesztése</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Személyazonosság törlése</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Beszélgetés ezzel a partnerrel</translation>
     </message>
@@ -11578,78 +12526,78 @@ p, li { white-space: pre-wrap; }
         <translation>Távoli beszélgetést kezdeményez ezzel a partnerrel</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation>Tulajdonos csomópont azonosító :</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Személyazonosság név :</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>Személyazonosság azonosító</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Üzenet elküldése</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Személyazonosság információ</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Személyazonosság azonosító :</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Csomópont tulajdonos neve:</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation>Új létrehozása</translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Típus:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Meghívó küldése</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>A véleményed:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>rossz</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>semleges</translation>
     </message>
@@ -11660,17 +12608,17 @@ p, li { white-space: pre-wrap; }
         <translation>jó</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Általánosan</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Névtelen</translation>
     </message>
@@ -11685,24 +12633,24 @@ p, li { white-space: pre-wrap; }
         <translation>Azonosító keresése</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Ez a személyazonosság a tiéd</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>Saját személyazonosságaim</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>Kapcsolataim</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation>Elemek megjelenítése</translation>
     </message>
@@ -11717,12 +12665,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>Más körök</translation>
     </message>
@@ -11732,7 +12675,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>Kör azonosító:</translation>
     </message>
@@ -11807,7 +12750,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nem-tag (nem férsz hozzá a kör adataihoz)</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>Személyazonosság azonosító:</translation>
     </message>
@@ -11837,7 +12780,7 @@ p, li { white-space: pre-wrap; }
         <translation>ismeretlen</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>Meghívott</translation>
     </message>
@@ -11852,7 +12795,7 @@ p, li { white-space: pre-wrap; }
         <translation>Tag</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>Kör szerkesztése</translation>
     </message>
@@ -11900,7 +12843,7 @@ p, li { white-space: pre-wrap; }
         <translation>Tagság megadása</translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11911,7 +12854,7 @@ Szabadulj meg tőle és készíts egy újat.
 Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Ismeretlen csomópont]</translation>
@@ -11954,7 +12897,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Névtelen személyazonosság</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12034,7 +12977,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation>Információ</translation>
     </message>
@@ -12050,12 +12993,25 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Személyazonosság másolása a vágólapra</translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <source>Send invite?</source>
+        <translation type="vanished">Küldesz meghívót</translation>
+    </message>
+    <message>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Letiltva</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Személyazonosságok&lt;/h1&gt;    			&lt;p&gt;Ezen a fülön készíthetsz új vagy szerkesztheted a már meglévő &lt;b&gt;ál-névtelen személyazonosságokat&lt;/b&gt;, és &lt;b&gt;köröket&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;A &lt;b&gt;személyazonosságokat&lt;/b&gt; használjuk az adataid biztonságos azonosításához: aláírják az üzeneteid a társalgószobákban, a fórum- és csatorna hozzászólásaidat, 				visszajelzést kapnak a Retroshare beépített e-mail rendszerén keresztül, hozzászólhatsz 				csatorna bejegyzésekhez, biztonságos alagutakon keresztül beszélgethetsz, stb.&lt;/p&gt; 			&lt;p&gt;Személyazonosságaidat&lt;b&gt;aláírhatod&lt;/b&gt; a Retroshare csomópontod tanúsítványával.   			Az aláírt Személyazonosságok jobban ellenőrizhetőbbek ezért megbízhatóbbnak számíthatnak, ugyanakkor hozzá vannak kapcsolva a csomópontod IP címéhez.&lt;/p&gt;  			&lt;p&gt;Az úgynevezett&lt;b&gt;Álnevek&lt;/b&gt; segítségével névtelenséged megőrzésével léphetsz kapcsolatba a többiekkel. Nem visszakereshető,  			ezáltal senki sem tudhatja, hogy pontosan kihez is tartozik egy ilyen személyazonosság.&lt;/p&gt;                     &lt;p&gt;A &lt;b&gt;Körök&lt;/b&gt; tulajdonképpen a hálózat személyazonosságainak (Álnév típusú, vagy aláírt) részhalmazai. Felhasználhatók  arra,              		hogy szigorítsuk a hozzáférést egy fórumhoz, csatornához, stb. &lt;/p&gt;                     &lt;p&gt;Egy &lt;b&gt;kör&lt;/b&gt; szűkíthető további körökkel, ezáltal láthatatlanná téve bizonyos tartalmakat olyanok számára akik nem tagjai a szűkebb köröknek. Sőt egy kör önmaga is lehet korlátozott, ez azt jelenti, hogy csak a meghívott személyek számára lesz látható a tartalom.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Unknown ID:</source>
+        <translation type="vanished">Ismeretlen azonosító:</translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12104,6 +13060,10 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>Chat</source>
         <translation>Beszélgetés</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Ismeretlen</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12144,11 +13104,19 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>Signature in distant tunnel system.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Update of identity data.</source>
+        <translation type="vanished">Személyazonosság adat frissítése.</translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Általános aláírás hitelesítés.</translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">Általános aláírás</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12160,7 +13128,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Titkosítás feloldása (általános)</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation>Hozzáadás a kapcsolatokhoz</translation>
     </message>
@@ -12210,21 +13178,21 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Személyek</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Saját avatár</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12234,7 +13202,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12249,7 +13217,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Beszélgetés ezzel a személlyel</translation>
     </message>
@@ -12264,12 +13232,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>A távoli beszélgetés nem engedélyezett ezzel a személlyel.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>Utoljára használva:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>50-nél több ismert PGP</translation>
     </message>
@@ -12289,12 +13257,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Tényleg törölni szeretnéd ezt a személyazonosságot?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12304,7 +13272,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Csomópont azonosító :</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>Tényleg törlöd?</translation>
     </message>
@@ -12312,7 +13280,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Becenév</translation>
     </message>
@@ -12342,7 +13310,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Álnév</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12352,19 +13320,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Új személyazonosság</translation>
     </message>
@@ -12378,7 +13339,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12388,12 +13349,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Személyazonosság szerkesztése</translation>
@@ -12404,27 +13360,27 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished">Frissít</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12444,7 +13400,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12454,7 +13410,11 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Hiba a kulcs beolvasásakor!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Hiba, érvénytelen Kulcs azonosító</translation>
     </message>
@@ -12469,7 +13429,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Ismeretlen igazi név</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Új személyazonosság létrehozása</translation>
     </message>
@@ -12479,15 +13439,10 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Típus</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Eltávolítás</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12513,7 +13468,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Hozzáadás</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12523,13 +13478,17 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Saját avatár</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Avatár beállítása</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12539,7 +13498,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Rendelkezhetsz egy vagy több személyazonossággal. Írhatsz velük társalgószobákba, hozzászólhatsz fórumokhoz és csatorna bejegyzésekhez. Végpontként viselkednek távoli beszélgetések valamint Retroshare távoli üzenetküldés esetén.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12598,6 +13557,10 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>PGP name:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">GXS azonosító:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12613,7 +13576,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
@@ -12623,12 +13586,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Összes megjelölése</translation>
     </message>
@@ -12647,38 +13610,26 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>Quote</source>
         <translation type="unfinished">Idézés</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Küldés</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Kép mentése</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Kép mentése sikertelen, érvénytelen fájlnév</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation>Ez nem kép</translation>
     </message>
@@ -12696,32 +13647,27 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Állapot:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12742,12 +13688,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12756,31 +13697,26 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Fájl megnyitása</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Mappa megnyitása</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Ellenőrzés...</translation>
     </message>
@@ -12790,7 +13726,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Fájlok ellenőrzése</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12818,7 +13754,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Barát hozzáadása</translation>
     </message>
@@ -12834,8 +13770,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Beállítások</translation>
     </message>
@@ -12856,7 +13791,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Kilépés</translation>
     </message>
@@ -12867,12 +13802,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Gyors beállítások varázsló</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 egy biztonságos, központosítatlan kommunikációs platform</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Befejezetlen</translation>
     </message>
@@ -12901,12 +13836,11 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Értesítés</translation>
     </message>
@@ -12917,35 +13851,31 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Levelek megnyitása</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Sávszélesség grafikon</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Alkalmazások</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Súgó</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Minimalizálás</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Teljes képernyő</translation>
     </message>
@@ -12960,12 +13890,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 új üzenet</translation>
     </message>
@@ -12995,7 +13920,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>%1 csatlakozott barát</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Tényleg ki szeretnél lépni a RetroShareből?</translation>
     </message>
@@ -13015,7 +13940,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Mutat</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Bizonyosodj meg róla, hogy ez a hivatkozás nem egy veszélyes weboldalra mutat.</translation>
     </message>
@@ -13060,13 +13985,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Szolgáltatás jogosultságok mátrix</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Statisztika</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Beépített böngésző megnyitása</translation>
     </message>
@@ -13081,7 +14005,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>Tényleg kilépsz?</translation>
     </message>
@@ -13090,17 +14014,17 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Írás</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Kapcsolatok</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Bekezdés</translation>
     </message>
@@ -13136,12 +14060,12 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Címsor 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Betűméret</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Betűméret növelése</translation>
     </message>
@@ -13156,32 +14080,32 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Félkövér</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Dőlt</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Igazítás</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Kép hozzáadása</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Kódrészlet beállítása</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Aláhúzott</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Tárgy:</translation>
     </message>
@@ -13192,32 +14116,32 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Címkék</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>Címek listája:</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Szövegszin beállítása</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Szöveg háttérszinének beállítása</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Ajánlott fájlok</translation>
     </message>
@@ -13287,7 +14211,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Hosszabb idézet</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Küldés neki:</translation>
     </message>
@@ -13311,6 +14235,10 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <source>&amp;Justify</source>
         <translation>&amp;sorkizárt</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">Minden cím (vegyes)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13322,7 +14250,7 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>Kapcsolataim</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Szia,&lt;br&gt;Szeretném a figyelmedbe ajánlani egy barátomat. Ha bennem megbízol, benne is megbízhatsz. &lt;br&gt;</translation>
     </message>
@@ -13342,18 +14270,18 @@ Ezek a személyazonosságok hamarosan kikerülnek a támogatásból.</translatio
         <translation>szeretne a barátod lenni</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Szia %1,&lt;br&gt;&lt;br&gt;%2 szeretne a barátod lenni.&lt;br&gt;&lt;br&gt;Válaszolj neki:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Köszönettel,&lt;br&gt;a RetroShare csapat</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Üzenet mentése</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Az üzenet nem lett elküldve.
@@ -13365,17 +14293,7 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>RetroShare link beillesztése</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Hozzáadás címzettként</translation>
     </message>
@@ -13395,7 +14313,7 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>Hozzáadás ajánlottként</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Eredeti üzenet</translation>
     </message>
@@ -13405,21 +14323,21 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Neki</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Másolat</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Küldve</translation>
     </message>
@@ -13434,7 +14352,7 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>%1, %2 írta:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Vá:</translation>
     </message>
@@ -13444,30 +14362,30 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>Tov:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Tárgy nélkül szeretnéd elküldeni az üzenetet?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Kérlek, adj meg legalább egy fogadót.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Rejtett másolat</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
@@ -13582,13 +14500,13 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>Részletek</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Fájl megnyitása...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-Fájlok (*.htm *.html);;Összes fájl (*)</translation>
     </message>
@@ -13608,7 +14526,7 @@ Szeretnéd piszkozatként menteni az üzenetet?</translation>
         <translation>PDF Exportálása</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Az üzenet nem lett elküldve.
@@ -13630,7 +14548,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Extra fájl hozzáadása</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13654,24 +14572,28 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">Van egy barát felkérésed</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Válasz most:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Feladó:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>Barát csomópontok</translation>
     </message>
@@ -13716,13 +14638,13 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Kösz, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Távoli személyazonosság:</translation>
     </message>
@@ -13732,12 +14654,12 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>[Hiányzik]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Hozz létre egy személyazonosságot, hogy aláírd a távoli üzeneteket, vagy töröld a távoli partnereket a cél listáról.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Csomópont név &amp; azonosító:</translation>
     </message>
@@ -13815,7 +14737,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Alapértelmezett</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Új fül</translation>
     </message>
@@ -13825,7 +14747,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Új ablak</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Címke szerkesztése</translation>
     </message>
@@ -13848,7 +14770,7 @@ Szeretnéd menteni az üzenetet?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Tárgy:</translation>
     </message>
@@ -13856,7 +14778,7 @@ Szeretnéd menteni az üzenetet?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Üzenet</translation>
     </message>
@@ -13884,7 +14806,7 @@ Szeretnéd menteni az üzenetet?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Ajánlott fájlok</translation>
     </message>
@@ -13894,37 +14816,37 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Az összes ajánlott fájl letöltése</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Tárgy:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Feladó:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Címzett:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Másolat:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Rejtett másolat:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Címkék:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Válasz</translation>
     </message>
@@ -13964,7 +14886,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>Meghívó küldése</translation>
     </message>
@@ -14016,7 +14938,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Elfogadom %1 baráti felkérését</translation>
     </message>
@@ -14026,12 +14948,12 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>%1 hozzáadása barátként</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Nincs tárgy</translation>
     </message>
@@ -14041,22 +14963,17 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Letöltés</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14066,23 +14983,17 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
+        <source>Send invite?</source>
+        <translation type="vanished">Küldesz meghívót?</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Az összes letöltése</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Dokumentum nyomtatása</translation>
     </message>
@@ -14097,12 +15008,12 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Html-Fájlok (*.htm *.html);;Összes fájl (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Ezen üzenethez mindig töltse be a képeket</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Csatolmány mező elrejtése</translation>
     </message>
@@ -14124,6 +15035,42 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Compose</source>
         <translation>Írás</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Válasz a kijelölt üzenetre</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Válasz</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Válasz az összes kijelölt üzenetre</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Válasz mindenre</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Kijelölt üzenet továbbítása</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Előre</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Kijelölt üzenet eltávolítása</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Törlés</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Kijelölt üzenet nyomtatása</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14202,7 +15149,7 @@ Szeretnéd menteni az üzenetet?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Új üzenet</translation>
     </message>
@@ -14212,16 +15159,60 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Írás</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Válasz a kiválasztott üzenetre</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Válasz</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Válasz az összes kiválasztott üzenetre</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Válasz mindenre</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Kiválasztott üzenet továbbítása</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Továbbítás</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Kiválasztott üzenet eltávolítása</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Törlés</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Kiválasztott üzenet nyomtatása</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Nyomtatás</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Megjelenítés beállításai</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Címkék</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Beérkezett üzenetek</translation>
@@ -14251,17 +15242,21 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Kuka</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Összes beérkezett:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Mappák</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Gyors nézet</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Nyomtatás...</translation>
@@ -14271,6 +15266,26 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Print Preview</source>
         <translation>Nyomatási kép</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Gombok csak ikonokként</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Szöveg az ikonok mellett</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Gombok csak szöveggel</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Gombok ikon alatti szöveggel</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Szöveg beállítása</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14292,7 +15307,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Üzenet továbbítása</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Tárgy</translation>
     </message>
@@ -14302,7 +15317,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
@@ -14312,7 +15327,39 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Tartalom</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Rendezés mellékletek szerint</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Rendezés tárgy szerint</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Rendezés olvasottság szerint</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Rendezés alak szerint</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Rendezés dátum szerint</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Rendezés címkék szerint</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Rendezés csillagozottság szerint</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Kijelölt üzenet továbbítása</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Tárgy keresése</translation>
     </message>
@@ -14321,11 +15368,6 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Search From</source>
         <translation>Keresés ebből</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14352,14 +15394,14 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Mellékletek keresése</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Csillagozott</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14433,7 +15475,7 @@ Szeretnéd menteni az üzenetet?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14447,7 +15489,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14462,33 +15504,34 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Piszkozatok</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Címzett</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Nincs elérhető csillagozott üzenet. A csillagokkal megjelölheted fontos üzeneteidet, hogy azokat könnyen megtaláld. Ehhez kattints a világosszürke csillagra az üzenet mellett.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Nincs elérhető rendszerüzenet.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Címzett</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Rendezés címzett szerint</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14496,6 +15539,22 @@ Szeretnéd menteni az üzenetet?</translation>
         <source>Total:</source>
         <translation>Összes:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Üzenetek</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Rendezés aláírás szerint</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Az üzenet aláírást tartalmazott és az értéke egyezett</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Az üzenet aláírást tartalmazott, de az értéke nem egyezik meg</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14523,17 +15582,7 @@ Szeretnéd menteni az üzenetet?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">Kép mentése</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Beillesztés sima szövegként</translation>
     </message>
@@ -14587,7 +15636,7 @@ Szeretnéd menteni az üzenetet?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -14597,7 +15646,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished">tőle</translation>
     </message>
@@ -14632,10 +15681,14 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Függő üzenetek</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
+    <message>
+        <source>Send invite?</source>
+        <translation type="vanished">Küldesz meghívót?</translation>
+    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -14773,7 +15826,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation>Partner azonosító</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Használatlan kulcsok eltávolítása...</translation>
     </message>
@@ -14783,7 +15836,7 @@ Szeretnéd menteni az üzenetet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Kulcstartó takarítása</translation>
     </message>
@@ -14801,13 +15854,7 @@ Megyjegyzés: A régi kulcstartódról biztonsági másolat készül.
 Az eltávolítás sikertelenül végződhet, ha egyszerre több Retroshare klienst futtatsz ugyanazon a gépen.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Kulcstartó adatai</translation>
@@ -14843,13 +15890,18 @@ A biztonság kedvéért a kulcstartód ezt megelőzően el lett mentve egy fájl
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Adatrendezési hiba a kulcstartóban. Ez valószínűleg egy programhiba. Kérlek lépj kapcsolatba a fejlesztőkkel.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Csak megbízható kulcsok</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Név keresése</translation>
     </message>
@@ -14859,18 +15911,25 @@ A biztonság kedvéért a kulcstartód ezt megelőzően el lett mentve egy fájl
         <translation>Partner azonosító keresése</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>Profil részletei</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Hálózat</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14897,7 +15956,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14918,7 +15977,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Csoportok</translation>
     </message>
@@ -14948,19 +16007,19 @@ Reported error:</source>
         <translation type="unfinished">barátlista visszaállítása a megtartott csoportokkal</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">Keresés</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">Azonosító</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished">Azonosító keresése</translation>
     </message>
@@ -14970,12 +16029,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished">Elemek megjelenítése</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14985,7 +16044,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Csoport</translation>
     </message>
@@ -15100,7 +16159,7 @@ Reported error:</source>
         <translation type="unfinished">Összes becsukása</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">El szeretnéd távolítani ezt a csomópontot?</translation>
     </message>
@@ -15110,7 +16169,7 @@ Reported error:</source>
         <translation type="unfinished">El szeretnéd távolítani ezt a barátot?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Kész!</translation>
@@ -15224,7 +16283,11 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">Naplóbejegyzések</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15239,7 +16302,11 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Összes eltávolítása</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Ez egy teszt.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>A legújabb felül</translation>
     </message>
@@ -15249,12 +16316,16 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>A legrégibb felül</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source>Log</source>
+        <translation type="vanished">Napló</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15309,6 +16380,10 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Blogs</source>
         <translation>Blogok</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Biztonság</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15330,6 +16405,10 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Message</source>
         <translation>Üzenet</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Csatlakozási kísérlet</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15346,6 +16425,10 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Ip security</source>
         <translation>IP biztonság</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">Napló</translation>
+    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -15356,6 +16439,10 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Circles</source>
         <translation>Körök</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Hivatkozások</translation>
+    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -15408,6 +16495,14 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Chat rooms</source>
         <translation>Társalgószobák</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">Társalgószobák</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="vanished">Kis- és nagybetű érzékeny</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15483,6 +16578,10 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Hírcsatorna</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15492,7 +16591,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15512,12 +16611,12 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Rossz jelszó!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Nem regisztrált beépülő/futtatható állomány</translation>
     </message>
@@ -15532,7 +16631,19 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <translation>Kérlek, ellenőrízd a rendszerórádat.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Megosztott fájlok vizsgálata...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Fájl hashelése</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Fájlindex mentése</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Teszt</translation>
     </message>
@@ -15543,19 +16654,17 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Ismeretlen cím</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Titkosított üzenet</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Ahhoz, hogy a társalgószobák megfelelően működjenek, a számítógép órájának pontosnak kell lennie. Kérlek ellenőrizd (Lehetséges időeltérést tapasztaltunk a barátaidhoz képest).</translation>
     </message>
@@ -15563,7 +16672,7 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Bejelentkezett barát</translation>
     </message>
@@ -15615,6 +16724,10 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Párbeszéd</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15680,6 +16793,10 @@ legalább egy partner nem lett hozzáadva a csoporthoz</translation>
         <source>This profile has signed your own profile key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Kulcs aláírások:</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15705,20 +16822,23 @@ p, li { white-space: pre-wrap; }
         <translation>PGP kulcs</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation>Ezek a beállítások a következő profil összes csomópontjára érvényesek:</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;A barátod kulcsának aláírása alkalmas arra, hogy kifejezd a bizalmad iránta és ezt jelezd a többiek felé. Ez segíthet nekik eldönteni, hogy elfogadják-e a kapcsolódást az adott kulcs tulajdonosától. Egy kulcs aláírása csak egy lehetőség, de visszavonhatatlan. Ezért fontold meg és dönts okosan.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">PGP kulcs aláírása</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15755,20 +16875,29 @@ p, li { white-space: pre-wrap; }
         <translation>Aláírásokat tartalmaz</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Beállítások</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;A Retroshare időnként ellenőrzi a barátlistád kereshető fájlokért, melyek megegyeznek az átviteli fájlokkal, azért, hogy közvetlen fájlátvitel valósulhasson meg. Ebben az esetben a barátod tudni fogja, hogy letöltöd azt a fájlt.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Hogy elkerüld ezt a viselkedést, és ki szeretnéd hagyni ebből ezt a barátodat, akkor szüntesd meg a doboz kijelölését. Továbbra is lehetőséged lesz a fájl letöltésére tőle, ehhez azonban előbb igényelned kell azt. Például az adott fájl manuális letöltésével a barátod megosztott mappájából. Ez a beállítás egy adott csomóponthoz tartozó összes helyszínre érvényes lesz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use as direct source, when available</source>
-        <translation type="unfinished">Közvetlen forrásként használat, amikor csak lehetséges</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ez az opció lehetővé teszi, hogy önműködően letöltsd az ennek a csomópontnak valamelyik üzenetben javasolt fájlt. Arra is használhatod, hogy saját csomópontjaid között fájlokat továbbíts. Ugyanazon csomópont összes helyszinére vonatkozik.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15801,21 +16930,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/másodpercenként</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Hiba: a partner adatai nem elérhetőek.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>A RetroShare nem támogatja a kulcsot.
@@ -15836,7 +16965,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen letöltést.</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15905,6 +17034,10 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Talán rossz a jelszó</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15912,12 +17045,12 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>RetroShare profil</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15943,7 +17076,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Beszélgetés</translation>
     </message>
@@ -15964,7 +17097,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
@@ -16004,7 +17137,7 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation>Időeltolódás:</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Üzenet írása</translation>
     </message>
@@ -16018,6 +17151,10 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>Friend Connected</source>
         <translation>Barát bejelentkezett</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Kapcsolódási kísérlet</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16056,13 +17193,17 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>Unknown</source>
         <translation type="unfinished">Ismeretlen</translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Ismeretlen partner</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Üzenet küldése</translation>
     </message>
@@ -16114,6 +17255,10 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>Chat with this person as...</source>
         <translation>Beszélgetés ezzel a személlyel mint...</translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">Üzenet küldése ennek a személynek</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -16229,6 +17374,13 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Forma</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16236,11 +17388,23 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>PhotoShare</source>
         <translation>Fényképmegosztás</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Fénykép</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Címke</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Hozzászólás</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Összefoglalva</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16301,6 +17465,14 @@ Figyelmeztetés: az Átvitel beállításainál Nem engedélyezted a közvetlen
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Hozzászólás írása</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Hozzászólás írása...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16371,6 +17543,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Album létrehozása</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Album megnézése</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16392,17 +17568,17 @@ p, li { white-space: pre-wrap; }
         <translation>Diavetítés</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Albumaim</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Album feliratkozások</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Megosztott albumok</translation>
     </message>
@@ -16431,7 +17607,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Album neve</translation>
     </message>
@@ -16490,19 +17666,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16538,12 +17714,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Szövegcímke</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Beépülő részleteinek mutatása</translation>
     </message>
@@ -16689,6 +17865,51 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Beéplők könyvtárai</translation>
     </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[leállítva]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Nincs támogatott API szám. Kérlek, olvasd el a beépülők fejlesztéséhez kapcsolódó leírást.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[betöltési hiba]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Nincs támogatott SVN szám. Kérlek, olvasd el a beépülők fejlesztéséhez kapcsolódó leírást.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Hiba a betöltéskor</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Hizányzó szimbólum. Rossz verzió?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Nem található beépülő</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Beépülő betöltve.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Ismeretlen állapot.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Fejlesztő verziók használatáért jelöld be ezt, így a hash értékeik nem
+lesznek ellenőrízve. Alapállapotban a hash érték ellenőrzése megvéd
+a kártevőként működő beépülők használatától.</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16758,27 +17979,12 @@ p, li { white-space: pre-wrap; }
         <translation>Mindig felül</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">Személy bannolása (Negatív véleményt állít be)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16812,6 +18018,14 @@ p, li { white-space: pre-wrap; }
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Ha bezárod ezt az ablakot, akkor a beszélgetés megszakad és megszűnik titkosított alagút.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Alagút bezárása?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16831,7 +18045,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Új</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Szavazás mellette</translation>
     </message>
@@ -16851,8 +18065,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Hozzászólások</translation>
     </message>
@@ -16877,13 +18091,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Hozzászólás</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished">Hozzászólások</translation>
     </message>
@@ -16911,12 +18125,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Általa aláírva:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Jegyzetek</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16931,22 +18153,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Kép betöltése</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16962,17 +18174,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16982,7 +18184,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Beküldés</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Jóváhagyás</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Új hozzászólás beküldése</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Kérlek, adj meg egy címet</translation>
     </message>
@@ -17002,22 +18216,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17032,7 +18236,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Hozzászólás mint</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17043,7 +18247,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Kép</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17053,7 +18257,7 @@ p, li { white-space: pre-wrap; }
         <translation>Cím</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Hivatkozás</translation>
     </message>
@@ -17061,12 +18265,40 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Közzétett hivatkozások</translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Téma létrehozása</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Topikjaim</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Feliratkozott témák</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Népszerű témák</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Egyéb témák</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Hivatkozások</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17100,7 +18332,31 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Beküldött téma</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Téma adminok hozzáadása</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Téma adminok kiválasztása</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Új téma létrehozása</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Téma szerkesztése</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Téma frissítése</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17138,17 +18394,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17164,7 +18410,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -17179,17 +18425,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Loading</source>
+        <translation type="vanished">Töltés</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">Soha</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17202,18 +18447,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Oldal</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Hozzászólások</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17224,12 +18473,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Hozzászólás</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished">Hozzászólások</translation>
     </message>
@@ -17239,7 +18488,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Az üzenet szerzője (azonosító: %1) bannolva van.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17249,17 +18498,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Szavazás mellette</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Szavazás ellene</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Megjelölés olvasottként és eltávolítás</translation>
     </message>
@@ -17269,7 +18522,7 @@ p, li { white-space: pre-wrap; }
         <translation>Új</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Új hozzászólás</translation>
     </message>
@@ -17279,7 +18532,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
@@ -17320,10 +18573,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Töltés</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">által</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Forma</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Népszerű</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Új</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Magas</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Ma</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Tegnap</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">A héten</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">A hónapban</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Az évben</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Új hozzászólás beküldése</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Következő</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Kérlek, hozz létre vagy válassz ki egy Aláíró azonosítót a szavazás előtt</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Előző</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17343,17 +18663,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17363,15 +18673,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Adminisztrátor:</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">ismeretlen</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17381,42 +18691,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">Bejegyzések</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17436,7 +18746,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Népszerű</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Keresés</translation>
     </message>
@@ -17466,17 +18776,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17491,17 +18801,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Üres</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17511,31 +18816,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Szerkesztés</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished">Információ</translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17550,7 +18851,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Feliratkozás</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">Soha</translation>
     </message>
@@ -17624,16 +18925,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Nincs csatorna kiválasztva</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17642,6 +18933,14 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Fülek</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Minden egyes téma megnyitása új fülön</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Hivatkozások</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17655,6 +18954,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Beküldve</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17723,16 +19026,16 @@ p, li { white-space: pre-wrap; }
         <translation>Profilkezelő</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17842,7 +19145,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Állapot szerkesztése</translation>
@@ -17858,7 +19161,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Profilkezelő</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Publikus adatok</translation>
     </message>
@@ -17893,12 +19196,12 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation>Online ettől kezdve:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Egyéb adatok</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Címem</translation>
     </message>
@@ -17942,27 +19245,51 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Küldés ebből:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Profil 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Profil 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Profil 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Pulzushoz adás</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">szűrő</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">URL hozzáadó</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Mutatás mint</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17972,12 +19299,12 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished">Feladó:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18007,13 +19334,13 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished">rossz</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18025,22 +19352,12 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18049,13 +19366,17 @@ az importálás gombot, hogy betöltsd.</translation>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Pulzus küldése a vezetékhez</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18070,24 +19391,34 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Kép betöltése</translation>
+        <source>From</source>
+        <translation type="vanished">Feladó</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Dátum</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18098,7 +19429,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished">Forma</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18117,7 +19448,7 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18127,7 +19458,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18154,7 +19485,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18164,7 +19495,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18184,7 +19515,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18300,7 +19631,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18308,42 +19639,37 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18375,7 +19701,7 @@ az importálás gombot, hogy betöltsd.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18383,8 +19709,8 @@ az importálás gombot, hogy betöltsd.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Megerősítés</translation>
     </message>
@@ -18655,12 +19981,12 @@ A &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; karakterek le lesznek cs
         <translation>Partner részletei</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Fájl kérése megszakítva</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>A RetroShare ezen verziója OpenPGP-SDK-t használ. Ennek hála, nem használja a rendszer PGP kulcstartóját, viszont van egy saját kulcstartója, amit az összes futó RetroShare elérhet. &lt;br&gt;&lt;br&gt;Úgy tűnik, hogy még nem rendelkezel ilyen kulcstartóval annak ellenére, hogy már létrehozott RetroShare fiókjaidban szerepelnek PGP kulcsok. Ez valószínűleg azért lehetséges, mert most frissítettél az alkalmazás új verziójára.</translation>
     </message>
@@ -18691,7 +20017,7 @@ A &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; karakterek le lesznek cs
         <translation>Váratlan hiba történt. Kérlek jelentsd &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation>A Tor-kezelő nem indul!</translation>
     </message>
@@ -18727,7 +20053,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Több példány</translation>
@@ -18750,26 +20076,6 @@ Kérlek, először zárd be azt. Zárolt fájl:
 Zárolófájl:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18852,7 +20158,7 @@ A hibajelentés:
         <translation>Adat továbbítása</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18862,7 +20168,7 @@ A hibajelentés:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>elindítva</translation>
     </message>
@@ -18872,7 +20178,7 @@ A hibajelentés:
         <translation>leállítva</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18888,7 +20194,7 @@ A hibajelentés:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>%1 másodperccel ezelőtt</translation>
     </message>
@@ -18956,7 +20262,7 @@ Security: no anonymous IDs</source>
 Biztonság: névtelen azonosítók nem engedélyezettek</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation>Belépés a társalgószobába</translation>
     </message>
@@ -18984,7 +20290,7 @@ Biztonság: névtelen azonosítók nem engedélyezettek</translation>
         <translation>nem lehet értelmezni az XML fájlt!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19164,29 +20470,13 @@ Biztonság: névtelen azonosítók nem engedélyezettek</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Név</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Csomópont</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished">Cím</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Állapot</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19379,6 +20669,10 @@ Biztonság: névtelen azonosítók nem engedélyezettek</translation>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Ez a tanúsítvány tartalmaz:</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19429,18 +20723,6 @@ Biztonság: névtelen azonosítók nem engedélyezettek</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19603,7 +20885,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Egész hálózat</translation>
     </message>
@@ -19786,7 +21068,7 @@ p, li { white-space: pre-wrap; }
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>A beágyazott képek megjelenítése tiltva van.</translation>
     </message>
@@ -19799,7 +21081,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Alapértelmezetten engedélyezve</translation>
     </message>
@@ -19972,22 +21254,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">Kép mentése</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19995,12 +21267,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation>Fa nézet beállítása</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20030,6 +21302,14 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">Mutatandó oszlop...</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[nincs cím]</translation>
+    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -20690,7 +21970,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Név</translation>
@@ -20811,7 +22091,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
@@ -20831,7 +22111,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20888,7 +22168,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Szerkesztett üzenet ... ]</translation>
     </message>
@@ -20902,6 +22182,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[Ismeretlen]</translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Hiányzó üzenet ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20915,11 +22200,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20942,18 +22222,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Rendezés olvasottság szerint</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Rendezés alak szerint</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20976,9 +22251,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20999,7 +22272,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Az összes tárolt RetroShare beállítás visszaváltása alapértelmezettre.</translation>
     </message>
@@ -21060,7 +22333,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>RetroShare nyelvi beállítása.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Naplófájl megnyitása sikertelen: &apos;%1&apos;: %2</translation>
     </message>
@@ -21081,7 +22354,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Változat</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation>működési mód</translation>
     </message>
@@ -21111,7 +22388,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21129,7 +22406,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21146,12 +22423,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Írj be egy kulcsszót (legalább három karakter hosszú legyen)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Keresés indítása</translation>
     </message>
@@ -21213,7 +22490,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Tisztítás</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Kulcsszavak</translation>
     </message>
@@ -21228,7 +22505,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Keresés azonosító</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Fájlnév</translation>
     </message>
@@ -21328,23 +22605,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Kiválasztott letöltése</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Fájlnév</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Letöltés</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare link másolása</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>RetroShare hivatkozás küldése</translation>
     </message>
@@ -21354,7 +22631,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Megjegyzés letöltése</translation>
     </message>
@@ -21391,7 +22668,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Összes eltávolítása</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Mappa</translation>
@@ -21402,17 +22679,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Új RetroShare hivatkozás(ok)</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Mappa megnyitása</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Gyűjtemény létrehozása</translation>
     </message>
@@ -21432,7 +22709,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Letöltés kollekciófájlból...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Kollekció</translation>
     </message>
@@ -21440,7 +22717,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Partner részletei</translation>
     </message>
@@ -21456,22 +22733,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>IP cím:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Partner azonosító:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Kapcsolat neve:</translation>
     </message>
@@ -21488,7 +22765,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Elrejt</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21513,8 +22790,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21522,7 +22799,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>a barátod szeretne lenni</translation>
     </message>
@@ -21553,7 +22830,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Lenyitás</translation>
     </message>
@@ -21598,12 +22875,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Állapot:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Üzenet írása</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Csatlakozási kísérlet</translation>
     </message>
@@ -21623,22 +22900,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ismeretlen (kimenő) csatlakozási kísérlet</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Ismeretlen biztonsági kockázat</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">Ismeretlen</translation>
     </message>
@@ -21648,7 +22920,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Ismeretlen partner</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Elrejt</translation>
     </message>
@@ -21658,7 +22934,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>El szeretnéd távolítani ezt a barátot?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21668,12 +22944,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Partner/csomópont nincs a barátlistádon (PGP azonosító=</translation>
     </message>
@@ -21732,12 +23008,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Helyi cím</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -21758,22 +23034,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Helyi hálózat</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Külső IP cím kereső</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Ismert / Előző IP címek:</translation>
     </message>
@@ -21786,16 +23062,21 @@ behind a firewall or a VPN.</source>
         <translation>Amennyiben ezt nem jelölöd be, a RetroShare csak akkor tudja meghatározni az IP címedet, ha már csatlakoztál valakihez. Engedélyezve hagyva akkor segíthet, ha csak kevés barátod van, vagy tűzfal mögül csatlakozol, illetve VPN-t használsz.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Engedélyezem a RetroSharenek, hogy a következő oldalakon lekérdezze az IP címemet:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>KB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21805,46 +23086,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Onion cím</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21854,7 +23112,7 @@ List of found external IP:
         <translation>Rejtett - Lásd Beállítások</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>I2P cím</translation>
     </message>
@@ -21879,95 +23137,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation>ügyfél</translation>
     </message>
@@ -21982,7 +23182,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>ismeretlen</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation>kapcsolat ellenőrzése</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation>kulcs létrehozása</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation>indulás</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation>leállás</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21992,7 +23256,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Elérhető vagy a rejtett szolgáltatáson keresztül.</translation>
     </message>
@@ -22004,12 +23283,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Rejtett mód]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22019,7 +23298,7 @@ Also check your ports!</source>
         <translation>Tisztítás</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>Letöltési korlát (KB/s)</translation>
     </message>
@@ -22034,23 +23313,23 @@ Also check your ports!</source>
         <translation>Feltöltési korlát (KB/s)</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22061,7 +23340,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation>Önműködő I2P/BOB</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22071,7 +23360,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22081,7 +23375,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation>Cím</translation>
     </message>
@@ -22121,7 +23425,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>kulcs betöltése</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation>Indítás</translation>
     </message>
@@ -22136,7 +23440,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>Leállítás</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation>Bejövő</translation>
     </message>
@@ -22172,32 +23481,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation>Közvetítő</translation>
     </message>
@@ -22252,7 +23536,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Összesen:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22277,7 +23561,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Kiszolgáló eltávolítása</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22289,7 +23573,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Hálózat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>IP szűrők</translation>
     </message>
@@ -22312,7 +23596,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
@@ -22372,28 +23656,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Hozzáadás a fehérlistához</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Rejtett szolgáltatás beállításai</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22409,18 +23682,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P kimenő kapcsolat rendben</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Kiszolgáló címe</translation>
     </message>
@@ -22455,12 +23728,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Kérlek adj meg egy szolgáltatás címet</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>IP tartomány</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22483,22 +23756,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Hozzáadva általad</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22533,7 +23806,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22543,12 +23816,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks Proxy</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor kimenő forgalom Rendben</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor proxy nincs engedélyezve</translation>
     </message>
@@ -22628,7 +23901,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Jelöld be, hogy mely partnereiddel szeretnél privát kulcsot megosztani</translation>
     </message>
@@ -22638,12 +23911,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Megosztás barátnak</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Megosztás</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22662,7 +23935,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Megosztáskezelő</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation>Megosztott mappa</translation>
     </message>
@@ -22682,17 +23955,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Láthatóság</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation>Hozzáadás</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Mappa hozzáadása a megosztáshoz</translation>
     </message>
@@ -22702,7 +23975,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Eltávolítás</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Alkalmazás és bezárás</translation>
     </message>
@@ -22793,7 +24066,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Nem található mappa, vagy a neve nem elfogadható.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Ezen listán a megosztott mappákat láthatod. Hozzáadhatsz újakat vagy eltávolíthatsz már megosztottakat az alul található gombok használatával.  Mikor egy új mappát adsz hozzá, az összes benne található fájl meg lesz osztva. Megosztási módokat egyenként testreszabhatod ki a listán szereplő mappákra.</translation>
     </message>
@@ -22801,7 +24074,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Fájlok</translation>
     </message>
@@ -22852,16 +24125,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>Megosztás ellenőrzése</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Kiválasztott letöltése</translation>
     </message>
@@ -22871,7 +24139,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Letöltés</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>RetroShare hivatkozás másolása a vágólapra</translation>
     </message>
@@ -22886,7 +24154,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>RetroShare hivatkozás küldése</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22902,7 +24170,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Ajánlás(ok)</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Gyűjtemény létrehozása</translation>
     </message>
@@ -22927,7 +24195,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Letöltés kollekciófájlból...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23070,12 +24338,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Beállítások betöltése</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Felület létrehozása</translation>
     </message>
@@ -23099,7 +24367,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Jelszó megjegyzése</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Bejelentkezés</translation>
     </message>
@@ -23440,7 +24708,7 @@ This choice can be reverted in settings.</source>
         <translation>Állapot üzenet</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Üzenet:</translation>
     </message>
@@ -23685,7 +24953,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Összes címke eltávolítása</translation>
     </message>
@@ -23721,15 +24989,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
@@ -23739,13 +25004,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation>Nincs beállítva</translation>
     </message>
@@ -23755,57 +25025,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Hiba</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Nem csatlakozott</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23813,7 +25038,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
@@ -23823,7 +25048,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23834,12 +25059,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23867,7 +25091,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Átvitel beállításai</translation>
@@ -23878,7 +25102,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maximum egyidejű letöltések száma:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation>Megosztott könyvtárak</translation>
     </message>
@@ -23888,27 +25112,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">A kész letöltések automatikus megosztása (Ajánlott)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished">Megosztott könyvtárak beállításai</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23993,7 +25212,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24002,12 +25221,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Ismewrősök feltöltéseinek száma legfeljebb (0=korlátlan)</translation>
     </message>
@@ -24032,12 +25246,7 @@ p, li { white-space: pre-wrap; }
         <translation>Közvetlen letöltés engedélyezése:</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Streamelés</translation>
     </message>
@@ -24102,7 +25311,12 @@ p, li { white-space: pre-wrap; }
         <translation>Maximális továbbított csatornák száma másodpercenként:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24112,17 +25326,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Vigyázat</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation>Fogadó könyvtár beállítása</translation>
     </message>
@@ -24150,7 +25354,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Letöltés elkészült</translation>
     </message>
@@ -24174,23 +25378,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">%1 letöltésed elkészült</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">%1 letöltésed elkészült</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 elkészült letöltés</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 elkészült letöltés</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Letöltések</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Feltöltések</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Név</translation>
@@ -24397,12 +25617,7 @@ p, li { white-space: pre-wrap; }
         <translation>Meghatározás...</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Mozgatás a sorban...</translation>
     </message>
@@ -24427,7 +25642,7 @@ p, li { white-space: pre-wrap; }
         <translation>Mappa kiválasztása</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24448,7 +25663,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24481,17 +25696,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 fájl nem teljes. Amennyiben ez egy médiafájl, próbáld ki az előnézetet.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Vigyázat</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Fájlnév megváltoztatása</translation>
     </message>
@@ -24506,7 +25711,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kérlek, írj be egy új --és megfelelő-- fájlnevet</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Összes lenyitása</translation>
@@ -24633,18 +25838,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Oszlopok</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Fájl átvitelek</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Elérési út</translation>
     </message>
@@ -24654,7 +25864,7 @@ p, li { white-space: pre-wrap; }
         <translation>Elérési útvonal mutatása</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24664,7 +25874,7 @@ p, li { white-space: pre-wrap; }
         <translation>Újból megpróbálod?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Gyűjtemény létrehozása</translation>
     </message>
@@ -24679,7 +25889,7 @@ p, li { white-space: pre-wrap; }
         <translation>Gyűjtemény megtekintése</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Kollekció</translation>
     </message>
@@ -24689,7 +25899,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 alagút</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24910,6 +26120,10 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">Névtelen alagutak</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25103,17 +26317,12 @@ p, li { white-space: pre-wrap; }
         <translation>Forma</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Állapot:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25153,27 +26362,21 @@ p, li { white-space: pre-wrap; }
         <translation>Engedélyezd a hozzáférést az összes IP cím részére (Alapértelmezett: csak localhost)</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <source>Apply setting and start browser</source>
+        <translation type="vanished">Beállítások alkalmazása és a böngésző indítása</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>A beépített böngésző nincs engedélyezve</translation>
     </message>
@@ -25183,12 +26386,12 @@ p, li { white-space: pre-wrap; }
         <translation>A beépített böngészőt a menü &quot;Beállítások&quot; -&gt; &quot;Böngésző&quot; pontjai alatt engedélyezheted.</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>a böngészőt nem sikerült elindítani</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Böngésző</translation>
     </message>
@@ -25325,7 +26528,11 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki oldalak</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Új csoport</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Oldalnév</translation>
     </message>
@@ -25340,7 +26547,7 @@ p, li { white-space: pre-wrap; }
         <translation>Eredeti azonosító</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25428,7 +26635,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Oldalszerkesztés előzményei</translation>
     </message>
@@ -25463,7 +26670,7 @@ p, li { white-space: pre-wrap; }
         <translation>Oldal azonosító</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25493,18 +26700,14 @@ p, li { white-space: pre-wrap; }
         <translation>Címkék</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Előzmények</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Szerkesztési előzmények mutatása</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
@@ -25525,7 +26728,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visszaállítás</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Jóváhagyás</translation>
     </message>
@@ -25597,6 +26800,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">Időhatár</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25608,7 +26815,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Frissítés</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25623,7 +26839,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Többiek</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25643,7 +26859,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25673,17 +26889,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Utolsó hónap</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Utolsó hét</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Ma</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Új</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">tőle</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">eddig</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Kereső/Szűrés</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Egész hálózat</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Profilok kezelése</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Mutatás:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Saját magad</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Barátok</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Követve</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Testreszabott</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Profil 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Profil 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Profil 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">Jelölőnégyzet</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Pulzus küldése a vezetékhez</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25746,42 +27030,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Forma</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Eltávolítás</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Hely:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25826,41 +27103,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Követve</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Ismeretlen</translation>
@@ -25938,7 +27185,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2d</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -25971,11 +27218,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Képek (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26094,6 +27345,10 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> - </source>
+        <translation type="vanished"> - </translation>
+    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_it.ts b/retroshare-gui/src/lang/retroshare_it.ts
index ade137565..389d7d42d 100644
--- a/retroshare-gui/src/lang/retroshare_it.ts
+++ b/retroshare-gui/src/lang/retroshare_it.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Aggiungi un commento</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: Ricerca Avanzata</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Criteri di Ricerca</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Aggiungi un altro criterio di ricerca.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Reinizializza i criteri di ricerca.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Annulla la ricerca.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Ricerca</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Creare Album</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Nome album:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Categoria:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Animali</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Famiglia</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Amici</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Fiori</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Vacanze</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Panorami</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Animali domestici</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Ritratti</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Viaggi</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Lavoro</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Casuale</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Didascalia:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Dove:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotografo:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descrizione:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Opzioni condivisione</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Politica:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Qualità:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Commenti:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Identità:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Pubblico</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Limitato</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Ridimensionare le immagini (&lt; 1 Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Ridimensionare le immagini (&lt; 10 Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Invia le immagini originali</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Nessun commento permesso</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Commenti autenticati</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Eventuali commenti ammessi</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Pubblica con identità</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Trascina &amp;amp; Lascia per inserire immagini. Clicca sull&apos;immagine per modificare i dettagli in basso.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Indietro</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Aggiungi foto</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Pubblicare Album</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Togli titolo Album</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Dì qualcosa su questo album...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Dove sono state prese queste?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Miniatura dell&apos;Album Load</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Album</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Miniatura dell&apos;album</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>EtichettaTesto</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Riassunto</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>Didascalia</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Dove:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Quando</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descrizione:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Opzioni condivisione</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Commenti</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Pubblicare l&apos;identità</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Visibilità</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Avvertimento: I servizi qui presenti sono sperimentali. Per favore aiutaci a testarli.
@@ -569,6 +783,14 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <source>Circles</source>
         <translation>Circoli</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">GxsForums</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">Canali Gxs </translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation>Fotografie</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">Salva immagine</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -633,13 +842,17 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Aggiungi Avatar</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Imposta immagine Avatar</translation>
     </message>
@@ -658,6 +871,10 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Carica Avatar</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation>Reimposta</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Velocità di Ricezione</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Velocità di Invio</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Sempre in Primopiano</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stile</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <source>% Opaque</source>
         <translation>% Opacità</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Salva</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Annulla</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Dal:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Nascondi Impostazioni</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,7 +1063,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Commento</translation>
     </message>
@@ -852,12 +1093,12 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L’autore di questo messaggio (con ID %1) è bloccato.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Vota per</translation>
     </message>
@@ -885,7 +1126,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Vota per</translation>
     </message>
@@ -943,7 +1184,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">Condividi</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Cambia lo stato dei messaggi letti</translation>
     </message>
@@ -983,7 +1224,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">Nuovo</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -991,12 +1232,12 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Mi piace</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Allarga</translation>
     </message>
@@ -1042,12 +1283,12 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,17 +1457,17 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Canali</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Tabs</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
@@ -1236,17 +1477,11 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Scaricamenti</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Carica i post in sottofondo (Argomento)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Apri ogni canale in una nuova tab</translation>
     </message>
@@ -1254,7 +1489,7 @@ Ma ricorda: Qualsiasi dato qui presente *SARÀ PERSO* quando aggiorneremo il pro
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1512,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Mi piace</translation>
     </message>
@@ -1302,18 +1537,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Allarga</translation>
     </message>
@@ -1328,7 +1563,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -1338,7 +1573,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Commento</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Nascondi</translation>
     </message>
@@ -1346,7 +1591,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -1537,7 +1782,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Mostra Chat di Gruppo</translation>
     </message>
@@ -1549,6 +1794,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>Chat</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Hai %1 nuovi messaggi</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Hai %1 nuovo messaggio</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 nuovi messaggi</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 nuovo messaggio</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1570,14 +1831,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Gruppo di interesse sconosciuto</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Rimuovi tutto</translation>
     </message>
@@ -1585,13 +1845,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Count</translation>
     </message>
@@ -1601,7 +1861,33 @@ into the image, so as to
         <translation>Argomento</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>Stanze di conversazione private sottoscritte</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>Stanze di conversazione pubbliche sottoscritte</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Stanze di conversazione private</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Stanze di conversazione pubbliche</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Stanze di conversazione&lt;/h1&gt;                              	                      &lt;p&gt;Le stanze di conversazione funzionano similmente a IRC.                                      	                      Esse ti permettono di parlare anonimamente con moltissime persone senza la necessità di avere amici.&lt;/p&gt;                    	                      &lt;p&gt;Una stanza di conversazione può essere pubblica (i tuoi amici la vedono) o privata (i tuoi amici non possono vederla, a meno che tu non li inviti con &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Una volta che sei stato invitato ad una stanza di conversazione privata, sarai in grado di vederla quando i tuoi amici la staranno usando.&lt;/p&gt;                                                                                               	                      &lt;p&gt;La lista a sinistra mostra il gruppo di conversazione alla quale i tuoi amici stanno partecipando.  Puoi sia                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Fare clic sul pulsante destro per creare una nuova stanza di conversazione&lt;/li&gt;                                                              		     &lt;li&gt;Fare doppio clic su una stanza di conversazione per entrare, chiacchierare e mostrare la stanza stessa ai tuoi amici&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Nota: Per far funzionare adeguatamente le stanze di conversazione, il tuo computer deve avere l&apos;ora impostata correttamente. Quindi controlla l&apos;ora del tuo sistema!&lt;/p&gt;                                      	                      </translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Crea chat room</translation>
     </message>
@@ -1611,7 +1897,7 @@ into the image, so as to
         <translation>Lascia questa stanza</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Crea un&apos;identità non anonima ed entra in questa stanza</translation>
     </message>
@@ -1670,12 +1956,12 @@ Seleziona delle stanze di conversazione sulla sinistra per vederne i dettagli.
 Fai doppio clic su una stanza di conversazione per entrare e conversare.</translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 ti invita alla stanza di conversazione chiamata %2</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1685,31 +1971,31 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Scegli un&apos;identità per questa stanza di conversazione:</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Crea chat di gruppo</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Nessun argomento disponibile]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Informazioni sul gruppo di interesse selezionato</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Privato</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Pubblico</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>ID anonime accettati</translation>
     </message>
@@ -1719,25 +2005,42 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Disabilita Abbonamento Automatico</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Abilita Abbonamento Automatico</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Cerca i gruppi delle chat</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Cerca nome</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Sottoscritto</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Colonne</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Sì</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">No</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1749,47 +2052,47 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Nome chat room:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>ID chat room:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Argomento:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Sicurezza:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Amici:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Etichetta Testo</translation>
     </message>
@@ -1804,24 +2107,13 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Nessuna ID anonima</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>colonna</translation>
@@ -1835,7 +2127,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Rimuovi Elemento</translation>
     </message>
@@ -1880,22 +2172,46 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Conversazione a distanza</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Tutti</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Contatti</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Nessuno</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Accetta una conversazione criptata a distanza da</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Impostazioni  Chat</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Abilita Emoticons nella Conversazione Privata</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Abilita Emoticons per la Chat di Gruppo</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Attivare i caratteri personalizzati</translation>
     </message>
@@ -1904,6 +2220,10 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Enable custom font size</source>
         <translation>Abilita dimensione del carattere personalizzata</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Dimensioni minime del font</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1915,7 +2235,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Abilitare il corsivo</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1940,7 +2260,11 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Carica immagini incorporate</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Grippo di discussione</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Lampeggiare l&apos;icona sulla scheda</translation>
     </message>
@@ -1949,6 +2273,10 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Do not send typing notifications</source>
         <translation>Non inviare le notifiche di digitazione</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Chat Privata</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1970,7 +2298,11 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Lampeggiare l&apos;icona finestra/scheda</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Chat Font</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Cambia Font per la Chat</translation>
     </message>
@@ -1980,10 +2312,14 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Font per la Chat</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Storico</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stile</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1998,13 +2334,17 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Variant:</source>
         <translation>Variante</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Chat di gruppo</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Chat privata</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2068,28 +2408,22 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In questa finestra puoi impostare quanti messaggi delle aree di conversazione RetroShare conserverà salvati sul disco e quanto verrà mostrato delle previe conversazioni, per i diversi sistemi di chat. Il periodo massimo di archiviazione consente di eliminare i messaggi vecchi e previene che lo storico delle conversazioni si riempa con chiacchiere volatili (p.es. aree di conversazione e conversazioni a distanza).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Gruppi di chat</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Abilitato:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2099,17 +2433,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Chat room</translation>
@@ -2206,7 +2530,11 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Periodo massimo di archiviazione, in giorni (0 = mantieni tutti):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Ricerca predefinita</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Maiusc./minusc. significativo</translation>
     </message>
@@ -2245,6 +2573,10 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Threshold for automatic search</source>
         <translation>Soglia per la ricerca automatica</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Identità predefinita per le aree di conversazione:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2312,7 +2644,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Mostra Chat</translation>
     </message>
@@ -2348,7 +2680,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
@@ -2383,12 +2715,12 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation>Corsivo</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>Inserisci emoticon</translation>
     </message>
@@ -2468,6 +2800,11 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <source>Insert horizontal rule</source>
         <translation>Inserisci riga orizzontale</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Salva immagine</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2505,7 +2842,7 @@ Fai doppio clic su una stanza di conversazione per entrare e conversare.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>sta scrivendo...</translation>
     </message>
@@ -2529,7 +2866,7 @@ dopo la conversione in HTML.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Vuoi veramente cancellare lo storico dal disco?</translation>
     </message>
@@ -2579,7 +2916,7 @@ dopo la conversione in HTML.</translation>
         <translation>è occupato probabilmente non risponderà</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Ricerca rispettando maiuscole/minuscole</translation>
     </message>
@@ -2601,7 +2938,7 @@ dopo la conversione in HTML.</translation>
         <translation>Non smettere di colorare dopo X elementi trovati (richiede più potenza CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Trova precedente &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2616,12 +2953,16 @@ dopo la conversione in HTML.</translation>
         <translation>&lt;b&gt;Trova &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Stato)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Imposta font e colore del testo</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Allega un file</translation>
     </message>
@@ -2637,12 +2978,12 @@ dopo la conversione in HTML.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Contrassegna questo testo selezionato&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctr+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2653,12 +2994,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation>Non firmato</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>elementi trovati.</translation>
     </message>
@@ -2678,7 +3019,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Digitare un messaggio qui</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Non smettere di colorare dopo</translation>
     </message>
@@ -2704,7 +3045,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Visualizzando i dettagli: </translation>
     </message>
@@ -2726,7 +3067,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Circoli personali</translation>
     </message>
@@ -2752,7 +3093,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Amici</translation>
     </message>
@@ -2812,7 +3153,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Amico di Amici</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Cerchia Esterna (Admin)</translation>
     </message>
@@ -2828,7 +3169,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Circoli</translation>
     </message>
@@ -2880,48 +3221,43 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Errore: impossibile ottenere dettagli contatto</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2933,7 +3269,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Cifratura</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>Non connesso</translation>
     </message>
@@ -3015,17 +3351,25 @@ Double click on it to add his name on text writer.</source>
         <translation>nessuno</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Questo certificato contiene:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;un &lt;b&gt;ID nodo&lt;/b&gt; ed un &lt;b&gt;nome&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">un &lt;b&gt;indirizzo onion&lt;/b&gt; ed una &lt;b&gt;porta&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">un &lt;b&gt;indirizz IP&lt;/b&gt; ed una &lt;b&gt;porta&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Puoi usare questo certificato per farti nuovi amici. Invialo per email, o consegnalo di persona.&lt;/p&gt;</translation>
     </message>
@@ -3040,7 +3384,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo è un metodo di criptazione usato da &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. La connessione ai nodi amici&lt;/p&gt;&lt;p&gt;è sempre pesantemente criptata e in caso sia presente il DHE la connessione utilizzerà anche &lt;/p&gt;&lt;p&gt;&amp;quot;la perfetta segretezza in avanti&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>con</translation>
     </message>
@@ -3057,16 +3401,108 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Wizard Connessione Amici</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Aggiungere un nuovo amico</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Y-Ottieno un file di certificato dal tuo amico</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">Fatti a&amp;mico con amici degli amici selezionati </translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Includi firme</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Copia nel PortaBlocco il Certificato</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Salva il tuo certificato in un File</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Lancia il programma di posta elettronica</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">Per favore, incolla il certificato Retroshare del tuo amico nel riquadro sottostante</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">File di certificato</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Utilizzo di certificati PGP salvato nel file.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Importare il certificato di un amico...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">È necessario generare un file con il tuo certificato e darlo al tuo amico. Inoltre, è possibile utilizzare un file già generato.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Esportare il mio certificato...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Trascinare e rilasciare il certificato di tuoi amici in questa finestra o specificare il percorso nella casella sottostante</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Scorri</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Amici di amici</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Selezionare ora con chi desideri fare amicizia.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Fammi vedere:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Farti amico con questi contatti</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>ID RetroShare</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Utilizzare ID RetroShare per aggiuntgere un amico disponibile in rete.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Aggiungere l&apos;ID RetroShare degli amici....</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Incollare ID degli amici RetroShare nella casella sottostante</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Immettere l&apos;ID RetroShare del tuo amico, ad esempio Peer@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3108,7 +3544,27 @@ Double click on it to add his name on text writer.</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Invitare gli amici via Email</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Inserire indirizzi email dei tuoi amici (separare ognuno con un punto e virgola)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Indirizzi email dei tuoi amici:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Inserisci gli indirizzi Email di amici</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Oggetto: </translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3124,32 +3580,77 @@ Double click on it to add his name on text writer.</source>
         <translation>Dettagli su richiesta</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Dettagli contatto</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Posta elettronica:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Nodo :</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">Tieni conto che se aggiungi troppi amici RetroShare richiederà quantità eccessive di banda, memoria e CPU. Puoi aggiungere quanti amici vuoi, ma oltre i 40 probabilmente serviranno troppo risorse.</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Località:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">Questa procedura guidata aiuterà a collegarti ai tuoi amici nella rete RetroShare.&lt;br&gt;Scegli come vorresti aggiungere un amico:</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Inserisce il certificato manualmente</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">Inserisce l’ID RetroShare manualmente</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">&amp;Spedisci un Invinto tramite gestori di Web Mail</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Raccomanda molti amici a vicenda</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">Certificato Retroshare</translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">Per favore, incolla il certificato Retroshare del tuo amico</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Incollare il certificato</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo riquadro richiede il certificato Retroshare del tuo amico. ATTENZIONE: Si tratta di una cosa diversa dalla chiave di profilo del tuo amico. Non incollare la chiave di profilo del tuo amico qui (nemmeno una sua parte). Non funzionerebbe.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Aggiungi i tuoi amici al gruppo:</translation>
     </message>
@@ -3159,7 +3660,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Autenticare amico (firma chiave PGP)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3184,22 +3685,16 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Aggiungi come amico per connettersi con</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Per accettare la Richiesta di Amicizia, fai clic sul bottone Fine.</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Siamo spiacenti, si è verificato qualche errore</translation>
     </message>
@@ -3219,27 +3714,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Dettagli sul tuo amico:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Chiave validità:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Firmatari</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmare la chiave di un amico è un modo di esprimergli la tua fiducia davanti agli altri amici. Le firme qui sotto attestano crittologicamente che i possessori delle chiavi elencate riconoscono l&apos;attuale chiave PGP come autentica.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Questo contatto è già sulla tua lista amici. Aggiungendolo potrebbe aver appena impostato l&apos;indirizzo ip.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3285,17 +3785,49 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Errore caricando il certificato</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Non è possibile ottenere dettagli contatto della chiave PGP %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Qualsiasi contatto che non ho firmato</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Amici dei miei amici che già si fidano di me</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Contatti Firmati appaiono come non accettati</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Nome contatto</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Firmato anche da</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Id contatto</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">Il certificato sembra valido</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Non è un certificato Retroshare valido!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Inviti RetroShare</translation>
     </message>
@@ -3315,12 +3847,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3328,7 +3860,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3368,7 +3900,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Hai una richiesta di amicizia da</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3393,7 +3925,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3403,7 +3935,47 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Fallito caricamento certificato: file %1 introvabile</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Questo contatto %1 indisponibile sulla tua rete</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Utilizza nuovo formato di certificato (più sicuro, più robusto)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Usa precedente formato di certificato (compatibile)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Rimuovi firme</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">Invito RetroShare</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Aiuto connessione amico </translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Puoi copiare questo testo e inviarlo al tuo amico via email o qualche altra maniera</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Il vostro Certificato è copiato nel PortaBlocco, incollalo e invialo ai tuoi amici via email o qualche altro modo</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Salva come...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3442,7 +4014,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Nessuno ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Usa come fonte diretta, quando disponibile</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>Ind. IP:</translation>
     </message>
@@ -3452,7 +4028,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Indirizzo IP</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Mostra Opzioni avanzate</translation>
     </message>
@@ -3461,6 +4037,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmare la chiave di un amico è un modo di esprimergli la tua fiducia davanti agli altri amici. Li aiuta a decidere quando accettare connessioni basate su quella chiave, fidandosi di te. Firmare una chiave è assolutamente facoltativo e la firma non si può revocare, quindi scegli saggiamente quando farlo.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare cerca periodicamente, nelle liste dei tuoi amici, files corrispondenti ai tuoi trasferimenti, così da poter stabilire dei trasferimenti diretti. In questo caso, il tuo amico saprà che tu stai scaricando uno dei suoi files.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Per prevenire questo comportamento solo per questo amico, deseleziona questa opzione. Puoi comunque effettuare un trasferimento diretto se lo richiedi esplicitamente, ad es. scaricando qualcosa dalla lista di files del tuo amico. Questa impostazione è applicata a tutte le locazioni dello stesso nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3471,13 +4051,45 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gli utenti con questa opzione abilitata non possono connettersi se il loro indirizzo di connessione non è nella lista degli indirizzi permessi. Questo ti protegge da attacchi basati sul traffico. Quando l&apos;opzione viene utilizzata, gli utenti rifiutati vengono riportati su &amp;quot;elementi sulla sicurezza dei dati in arrivo&amp;quot; nella sezione relativa alle novità sui dati in arrivo. Da li, potrai permettere/bloccare i loro indizzi IP. Si applica a tutte le locazioni dello stesso nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Raccomanda molti amici gli uni agli altri</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Consigli dell&apos;amico</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">Il testo sottostante è il tuo certificato Retroshare. Dovrai darlo al tuo amico.</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Messaggio:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Raccomanda amici</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">A</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Si prega di selezionare almeno un amico da raccomandare.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Si prega di selezionare almeno un amico come destinatario.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Aggiungi chiave al portachiavi.</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Questa chiave è già presente nel portachiavi</translation>
     </message>
@@ -3493,7 +4105,7 @@ messaggi distanti a questo contatto
 anche se non hai amici.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Il certificato ha un numero di versione errato. Ricorda che la versione 0.5 e la 0.6 delle reti sono incompatibili.</translation>
     </message>
@@ -3528,7 +4140,7 @@ anche se non hai amici.</translation>
         <translation>Aggiungi IP alla whitelist</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>Nessun IP in questo certificato</translation>
     </message>
@@ -3538,10 +4150,27 @@ anche se non hai amici.</translation>
         <translation>&lt;p&gt;Questo certificato non ha indirizzo IP. Dovrai utilizzare la ricerca e la DHT per trovare il tuo amico. Dato che richiedi l&apos;uso di una lista di IP autorizzati, l&apos;utente sarà segnalato nella lista degli elementi di sicurezza in ingresso. Da li potrai autorizzare il suo indirizzo IP.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Aggiunto con certificato da %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Incolla il Certificato del tuo amico dal PortaBlocco</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Fallito caricamento certificato: impossibile leggere dal file %1</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Fallito caricamento certificato: qualcosa non va con %1</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3603,7 +4232,7 @@ anche se non hai amici.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>Impostazione UDP</translation>
     </message>
@@ -3631,7 +4260,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Assistente di connessione</translation>
     </message>
@@ -3641,20 +4270,17 @@ p, li { white-space: pre-wrap; }
         <translation>ID dell&apos;amico non valido</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Stato sconosciuto</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Dietro ad un NAT simmetrico</translation>
     </message>
@@ -3664,14 +4290,12 @@ p, li { white-space: pre-wrap; }
         <translation>Dietro un NAT &amp; nessun DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Riavvio rete</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>Dietro un NAT</translation>
     </message>
@@ -3681,8 +4305,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nessun DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>Stato della rete buono!</translation>
     </message>
@@ -3707,7 +4330,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ricerca degli amici RS in corso</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Il controllo richiede DHT</translation>
     </message>
@@ -3999,7 +4622,7 @@ p, li { white-space: pre-wrap; }
         <translation>Si prega di riprovare importando l&apos;intero Certificato</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4007,8 +4630,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/D</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>FORWARD NON VERIFICABILE!</translation>
     </message>
@@ -4018,7 +4640,7 @@ p, li { white-space: pre-wrap; }
         <translation>FORWARD NON VERIFICABILE E NESSUNA DHT!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Cercando</translation>
     </message>
@@ -4054,12 +4676,12 @@ p, li { white-space: pre-wrap; }
         <translation>Dettagli della cerchia</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4079,7 +4701,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4099,18 +4721,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filtro</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Soprannome</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Membri invitati</translation>
     </message>
@@ -4125,7 +4747,15 @@ p, li { white-space: pre-wrap; }
         <translation>Persone conosciute</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Tipo</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -4165,19 +4795,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Visibile soltanto ai membri di:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Per favore imposta un nome per la tua cerchia</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Nessuna cerchia ristretta selezionata </translation>
     </message>
@@ -4187,24 +4821,12 @@ p, li { white-space: pre-wrap; }
         <translation>Nessuna cerchia limitata selezionata</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
@@ -4214,7 +4836,7 @@ p, li { white-space: pre-wrap; }
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Cerca</translation>
@@ -4229,6 +4851,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Firmato</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Firmato da Nodi conosciuti</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4245,6 +4871,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>Identità PGP</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Id Anonimo</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4267,13 +4897,17 @@ p, li { white-space: pre-wrap; }
         <translation>Crea una nuova cerchia</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Crea</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP Id Collegato</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Aggiungere membro</translation>
     </message>
@@ -4292,7 +4926,7 @@ p, li { white-space: pre-wrap; }
         <translation>Crea un Gruppo</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Nome gruppo:</translation>
     </message>
@@ -4327,7 +4961,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Nuovo post nel canale</translation>
     </message>
@@ -4337,7 +4971,7 @@ p, li { white-space: pre-wrap; }
         <translation>Post del canale</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4398,11 +5032,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Usa i bottoni Trascina-Lascia / Aggiungi Files, per segmentare nuovi files.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Copia/Incolla collegamenti RetroShare dalle tue condivisioni&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Aggiungi un file da allegare</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Aggiungi miniature del canale</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Messaggio</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Oggetto:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4488,17 +5134,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4517,18 +5163,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">File già aggiunto e codificato</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Aggiungi un Oggetto</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Carica una miniatura d&apos;immagine</translation>
     </message>
@@ -4543,12 +5188,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Genera dati di massa</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Vuoi davvero generare %1 messaggi ?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Stai per aggiungere dei file che non stai condividendo veramente. Vuoi comunque che questo succeda?</translation>
     </message>
@@ -4582,7 +5233,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Posta un Messaggio nel Forum</translation>
     </message>
@@ -4591,6 +5242,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Oggetto</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4611,8 +5266,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4631,7 +5286,7 @@ p, li { white-space: pre-wrap; }
         <translation>Puoi allegare files con Trascina  e Lascia qui in questa finestra</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4661,17 +5316,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Nessun forum</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>In Risposta a</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Titolo</translation>
     </message>
@@ -4724,7 +5379,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Carica un file immagine</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>ID non compatibile con questo forum</translation>
     </message>
@@ -4734,8 +5389,8 @@ Do you want to discard this message?</source>
         <translation>A nessuna delle tue identità è permesso scrivere in questo forum. Questo può derivare dalla limitazione del forum ad una cerchia nella quale non è presente nessuna delle tue identità, oppure perché il forum richiede identità firmate con PGP.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Genera dati di massa</translation>
     </message>
@@ -4744,6 +5399,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Vuoi davvero generare %1 messaggi ?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Invia</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4758,7 +5417,23 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Crea un gruppo di Chat</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Un gruppo di discussione (lobby) è un gruppo di conversazione anonimo e decentralizzato. Tutti i partecipanti ricevono tutti i messaggi. Una volta creata la lobby è possibile invitare altri amici dalla scheda amici.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Nome del gruppo:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Argomento Gruppo di Conversazione:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4793,7 +5468,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Crea</translation>
     </message>
@@ -4803,7 +5478,11 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">Se la imposti, solo le identità firmate con PGP potranno essere usate per unirsi e parlare in questo gruppo. Questa limitazione previene lo spamming anonimo dato che diventa possibile, almeno per qualcuno del gruppo, localizzare il nodo dello spammer.</translation>
+    </message>
+    <message>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>richiede identità firmate-PGP</translation>
     </message>
@@ -4818,7 +5497,11 @@ Do you want to discard this message?</source>
         <translation>Seleziona gli Amici con cui avere conversazione di gruppo.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Amici invitati</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Crea una stanza di conversazione</translation>
@@ -4839,7 +5522,7 @@ Do you want to discard this message?</source>
         <translation>Contatti:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Identità da utilizzare:</translation>
     </message>
@@ -4847,17 +5530,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Informazioni pubbliche</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Località:</translation>
     </message>
@@ -4867,12 +5550,12 @@ Do you want to discard this message?</source>
         <translation>ID della località:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Versione del software:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Online dal:</translation>
     </message>
@@ -4892,7 +5575,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4902,7 +5590,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Altre informazioni</translation>
     </message>
@@ -4912,12 +5600,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished">Profilo</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Certicato</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4927,7 +5620,11 @@ Do you want to discard this message?</source>
         <translation>Includi Firma</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Salvare la chiave in un file</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Esporta Identità</translation>
     </message>
@@ -4999,33 +5696,33 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Etichetta Testo</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>Impronta PGP:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Informazioni nodo</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>Id PGP :</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Nodi amici:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5064,6 +5761,14 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>Node</source>
         <translation>Nodo</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Crea nuovo nodo...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">Mostra la finestra delle statistiche</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5080,6 +5785,10 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Retroshare usa il DHT di Bittorrent come proxy per le connessioni. Non &quot;salva&quot; il tuo indirizzo IP nel DHT. 				                        Al contrario il DHT è utilizzato dai tuoi amici per raggiungerti, tramite delle normali richieste al DHT. 												La pallina di stato diventerà verde non appena Retroshare otterrà una risposta DHT da uno dei tuoi amici.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5115,7 +5824,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5783,7 +6492,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>File di avvio</translation>
     </message>
@@ -5791,38 +6500,38 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>a</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>ignora maius./minus.</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>gg.MM.aaaa</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5830,12 +6539,12 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Widget di Espressione</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Cancella Espressione</translation>
     </message>
@@ -5997,7 +6706,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Immagine</translation>
     </message>
@@ -6007,7 +6716,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>File audio</translation>
     </message>
@@ -6067,21 +6776,11 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>C </source>
         <translation>C </translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Cartelle amici</translation>
     </message>
@@ -6203,7 +6902,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -6238,6 +6937,10 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>Show State</source>
         <translation>Mostra Stato</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">Nodi fidati</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6245,7 +6948,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Mostra Grupppi</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
@@ -6281,7 +6984,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Aggiungi al gruppo</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Cerca</translation>
@@ -6297,7 +7000,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Ordina per stato</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Dettagli profilo</translation>
     </message>
@@ -6541,7 +7244,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Conferma richiesta di amicizia</translation>
     </message>
@@ -6558,6 +7261,10 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Cerca:</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6579,7 +7286,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Cerca Amici</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Contrassegna tutto</translation>
     </message>
@@ -6590,134 +7297,16 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Nome</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Fatti amico</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished">Il proxy non è abilitato, o è danneggiato.
-I servizi sono tutti sù e ben funzionanti??
-Controlla anche le tue porte!</translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Modificare il messaggio di stato</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Trasmetti</translation>
     </message>
@@ -6800,38 +7389,33 @@ Controlla anche le tue porte!</translation>
         <translation>Reinizializza carattere predefinito</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Deposito delle Chiavi</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Rete&lt;/h1&gt; &lt;p&gt;La scheda Rete mostra i tui nodi RetroShare amici: i nodi di RetroShare adiacenti che sono collegati a te. &lt;/p&gt; &lt;p&gt;Puoi raggruppare assieme i nodi per consentire un accesso più granulare alle informazioni, p.es. consentire solo ad alcuni nodi di vedere certi tuoi file.&lt;/p&gt; &lt;p&gt;A destra, troverai 3 schede utili: &lt;ul&gt;&lt;li&gt;Diffusione, per inviare messaggi contemporaneamente a tutti i nodi connessi&lt;/li&gt; &lt;li&gt;Grafico rete locale, mostra la rete intorno a te, basandosi sulle informazioni di rilevamento&lt;/li&gt; &lt;li&gt;Portachiavi, contiene le chiavi di nodo che hai raccolto, per lo più trasmesse dai tuoi nodi amici&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Grafico della rete</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Imposta il tuo messaggio di stato qui</translation>
     </message>
@@ -6849,17 +7433,7 @@ Controlla anche le tue porte!</translation>
         <translation>Parola chiave</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Ogni campio deve avere minimo 3 caratteri</translation>
     </message>
@@ -6869,12 +7443,17 @@ Controlla anche le tue porte!</translation>
         <translation>Le password non corrispondono</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Questa Password è per PGP</translation>
@@ -6895,38 +7474,46 @@ Controlla anche le tue porte!</translation>
         <translation>Impossibile generare il nuovo certificato, forse la password PGP è errata!</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <source>Options</source>
+        <translation type="vanished">Opzioni</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation>Lunghezza chiave PGP</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Nodo standard</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">Nodo TOR/I2P nascosto</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Nome nodo</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6946,12 +7533,12 @@ Controlla anche le tue porte!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Esporta questo profilo</translation>
     </message>
@@ -6961,43 +7548,42 @@ Controlla anche le tue porte!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Opzioni avanzate</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>indirizzo nascosto</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Il tuo profilo è associato ad una coppia di chiavi PGP. RetroShare attualmente ignora chiavi DSA.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questa è la porta di connessione.&lt;/p&gt;&lt;p&gt;Qualsiasi valore tra 1024 e 65535 &lt;/p&gt;&lt;p&gt;dovrebbe andar bene. Puoi modificarlo in seguito.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7045,13 +7631,13 @@ il bottone IMPORT per caricarlo</translation>
         <translation>Profilo non salvato. Si è verificato un errore.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importa profilo</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7061,7 +7647,7 @@ il bottone IMPORT per caricarlo</translation>
         <translation>Crea nuovo nodo Retroshare</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation>Indirizzo Tor/I2P</translation>
     </message>
@@ -7096,7 +7682,7 @@ il bottone IMPORT per caricarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7106,7 +7692,12 @@ il bottone IMPORT per caricarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7116,7 +7707,12 @@ il bottone IMPORT per caricarlo</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7342,13 +7938,36 @@ il bottone IMPORT per caricarlo</translation>
         <translation>Avvio</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Invita amici</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;RetroShare è nulla senza i tuoi amici. Fai click sul bottone per cominciare il processo.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Manda un invito via mail col tuo &amp;quot;ID Certificato&amp;quot; ai tuoi amici  &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Assicurati di ricevere anche il loro invito... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Puoi connetterti agli amici solo se vi siete aggiunti reciprocamente.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Aggiungi i tuoi amici a RetroShare</translation>
     </message>
@@ -7358,103 +7977,89 @@ il bottone IMPORT per caricarlo</translation>
         <translation>Aggiungi amici</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Connetti con amici</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avanzate: Apri porta nel firewall</translation>
-    </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Connetti con amici</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avanzate: Apri porta nel firewall</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Ulteriore aiuto e supporto</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Apri il sito di RS</translation>
     </message>
@@ -7479,7 +8084,7 @@ p, li { white-space: pre-wrap; }
         <translation>Opinioni via email</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>Inviti RetroShare</translation>
     </message>
@@ -7529,12 +8134,12 @@ p, li { white-space: pre-wrap; }
         <translation>Opinioni su RetroShare</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>Supporto RetroShare</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Ha molte funzionalità, come conversazioni integrate, messaggerie,</translation>
     </message>
@@ -7658,7 +8263,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Mostra conversazioni di gruppo</translation>
     </message>
@@ -7666,7 +8271,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[Sconosciuto]</translation>
     </message>
@@ -7832,11 +8437,15 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Puoi far sapere agli amici del tuo forum condividendolo con loro. Seleziona gli amici con cui vuoi condividere il forum.</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">Condividi i permessi amministrativi dell’argomento</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Titolo</translation>
     </message>
@@ -7849,12 +8458,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7879,7 +8488,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">Ordinamento decrescente</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">Ordinamento crescente</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">Ordina per nome</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Ordina per popolarità</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Ordina per post recente</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7894,14 +8523,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Id</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Ultimo post</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
@@ -7912,13 +8541,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popolarità</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Mostra</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7931,7 +8564,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>e</translation>
     </message>
@@ -8067,7 +8700,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Canali</translation>
@@ -8078,22 +8711,22 @@ p, li { white-space: pre-wrap; }
         <translation>Cra canale</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Abilita scaricamento automatico</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Miei canali</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Canali sottoscritti</translation>
     </message>
@@ -8113,12 +8746,12 @@ p, li { white-space: pre-wrap; }
         <translation>Seleziona la cartella di download per il canale</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Annulla scaricamento automatico</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>Imposta la cartella di download</translation>
     </message>
@@ -8153,22 +8786,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Esegui</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Apri cartella</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
@@ -8188,17 +8821,17 @@ p, li { white-space: pre-wrap; }
         <translation>Verifica</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Sei sicuro di voler annullare ed eliminare questo file?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Non è possibile aprire la cartella</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Riprodurre File</translation>
     </message>
@@ -8208,10 +8841,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Il file %1 non esiste nella posizione.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Modulo</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Nome file</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Dimensioni</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Titolo</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Pubblicato</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Status</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Crea un Nuovo Canale</translation>
     </message>
@@ -8249,19 +8909,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Abbonati al Canale</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8275,7 +8925,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -8290,7 +8940,7 @@ p, li { white-space: pre-wrap; }
         <translation>Descrizione Canale</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Sto caricando...</translation>
     </message>
@@ -8305,9 +8955,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">Mai</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Nuovo canale</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8318,7 +8967,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Nuovo commento:</translation>
     </message>
@@ -8339,7 +8988,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Esegui</translation>
     </message>
@@ -8396,24 +9045,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Files</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Attenzione! Hai meno di %1 ore e %2 minuti prima che questo file venga eliminato. Considera di salvarlo.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Commento</translation>
     </message>
@@ -8428,17 +9081,21 @@ p, li { white-space: pre-wrap; }
         <translation>Non mi piace</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Sto caricando...</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8463,16 +9120,119 @@ p, li { white-space: pre-wrap; }
         <translation>Esegui Media</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Posta sul Canale</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Sto caricando...</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Cerca canali</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Titolo</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Ricerca Titolo</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Messaggio</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Cerca Messaggio</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Nome file</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Cerca Nome File</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Nessun Canale Selezionato</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Mai</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Pubblico</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Disabilita Download Automatico</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Abilita Download Automatico</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Mostra notizie</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Mostra files</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Amministratore:</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Ultimo post:</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">sconosciuto</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Distribuzione:</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Dispaccio</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Files</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Iscritti</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Descrizione:</translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">Posts (a nodi adiacenti):</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Posta sul Canale</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8542,7 +9302,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8578,7 +9338,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Commenti</translation>
     </message>
@@ -8593,13 +9353,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Dispaccio</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8614,7 +9374,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8629,7 +9389,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8689,22 +9449,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8751,7 +9501,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+2"/>
         <source>Unknown</source>
-        <translation type="unfinished">Scononsciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+40"/>
@@ -8779,13 +9529,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Sottoscritto</translation>
     </message>
@@ -8817,12 +9566,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+59"/>
         <source>Disable Auto-Download</source>
-        <translation type="unfinished">Annulla scaricamento automatico</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Enable Auto-Download</source>
-        <translation type="unfinished">Abilita scaricamento automatico</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -8836,17 +9585,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8961,7 +9710,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Commenta Contenitore</translation>
     </message>
@@ -8974,7 +9723,7 @@ p, li { white-space: pre-wrap; }
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9004,7 +9753,7 @@ p, li { white-space: pre-wrap; }
         <translation>Aggiornamento</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Commento</translation>
@@ -9043,7 +9792,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Risposta al commento</translation>
     </message>
@@ -9067,21 +9816,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Vota contro</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9091,7 +9825,7 @@ p, li { white-space: pre-wrap; }
         <translation>Commento di rendere</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9120,10 +9854,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//IT&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:12pt; font-weight:600;&quot;&gt;Commento&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">FIrmato da</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9152,7 +9902,7 @@ before you can comment</source>
 prima che tu possa commentare</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9194,6 +9944,14 @@ prima che tu possa commentare</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Aggiungi Amministratori al Forum</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Seleziona Amministratori del Forum</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9203,7 +9961,7 @@ prima che tu possa commentare</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Abbonati al Forum</translation>
     </message>
@@ -9219,7 +9977,7 @@ prima che tu possa commentare</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -9239,9 +9997,8 @@ prima che tu possa commentare</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Sto caricando...</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9272,13 +10029,13 @@ prima che tu possa commentare</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Oggetto:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Abbandona Forum</translation>
     </message>
@@ -9289,7 +10046,7 @@ prima che tu possa commentare</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -9309,17 +10066,21 @@ prima che tu possa commentare</translation>
         <translation>In Risposta a:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Sto caricando...</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Forum Notizie</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
@@ -9332,66 +10093,63 @@ prima che tu possa commentare</translation>
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Avvia un nuovo argomento nel forum selezionato</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Ricerca forums</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Ultimo post</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished">Nuovo Thread</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Vista per argomento</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Vista semplice</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Autore</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Salva immagine</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Sto caricando</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9401,7 +10159,12 @@ prima che tu possa commentare</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Messaggio di risposta</translation>
     </message>
@@ -9425,6 +10188,10 @@ prima che tu possa commentare</translation>
         <source>Download all files</source>
         <translation>Scarica tutti i files</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Successivo non letto</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9441,23 +10208,31 @@ prima che tu possa commentare</translation>
         <translation>Cerca autore</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Contenuto</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Ricerca di contenuti</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Nessun nome</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Rispondi</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9500,12 +10275,20 @@ prima che tu possa commentare</translation>
         <translation>Copia collegamento RetroShare</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Allarga</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Bloccato]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[sconosciuto]</translation>
     </message>
@@ -9535,8 +10318,8 @@ prima che tu possa commentare</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation>Distribuzione</translation>
     </message>
@@ -9550,6 +10333,26 @@ prima che tu possa commentare</translation>
         <source>Anti-spam</source>
         <translation>Anti-spam</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Messaggio Redatto ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anonimo</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">firmato</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">nessuno</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Messaggio Perso ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9619,12 +10422,12 @@ prima che tu possa commentare</translation>
         <translation>Messaggio Originale</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">Modifica</translation>
     </message>
@@ -9685,7 +10488,7 @@ prima che tu possa commentare</translation>
         <translation>Reputazione autore</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9705,7 +10508,7 @@ prima che tu possa commentare</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9757,7 +10560,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9767,7 +10570,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9782,7 +10585,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9848,12 +10651,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forums</translation>
@@ -9884,16 +10687,35 @@ This message is missing. You should receive it later.</source>
         <translation>Altri froum</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">in attesa</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Recupero</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Caricamento</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Aggiungi icona</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>I destinatari della chiave possono pubblicare nei canali di tipo limitato, e vedere e pubblicare in questi canali.</translation>
     </message>
@@ -9902,14 +10724,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Condividi chiave pubblicazione</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">verifica i contatti con cui vuoi condividere la chiave privata di pubblicazione</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Condividi chiave con</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Distribuzione messaggio</translation>
     </message>
@@ -9917,7 +10747,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Pubblico</translation>
     </message>
@@ -9936,6 +10766,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nuovo Thread</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Obbligatorio</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Messaggi cifrati</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9977,7 +10815,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Commenti:</translation>
     </message>
@@ -10000,7 +10838,7 @@ This message is missing. You should receive it later.</source>
         <translation>Anti-spam:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10016,12 +10854,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10038,23 +10876,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>Richiesta firma PGP</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10070,28 +10908,30 @@ This message is missing. You should receive it later.</source>
         <translation>Aggiungi un Nome</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>caricamento Logo Gruppo</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Applica Modifiche al Gruppo</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Non è stato possibile preparare i MetaDati del Gruppo — procedi con la Revisione</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Verrà utilizzato per inviare feedback</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Proprietario:</translation>
     </message>
@@ -10101,12 +10941,12 @@ This message is missing. You should receive it later.</source>
         <translation>Inserisci qui una descrizione</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10116,7 +10956,7 @@ This message is missing. You should receive it later.</source>
         <translation>Ultimo post</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10191,12 +11031,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Popolarità</translation>
     </message>
@@ -10212,22 +11047,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Crea</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Autore</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>GxsIdLabel</translation>
     </message>
@@ -10235,7 +11075,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Sto caricando...</translation>
     </message>
@@ -10295,7 +11135,7 @@ This message is missing. You should receive it later.</source>
         <translation>Modifica Dettagli</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10352,12 +11192,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Copia Collegamento RetroShare</translation>
     </message>
@@ -10380,7 +11220,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Nessuna firma</translation>
     </message>
@@ -10393,24 +11233,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Sto caricando...</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Non trovato</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Nessuna firma</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Bloccato]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Autenticazione</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>Chiave sconosciuta</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">Anonimo</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10420,12 +11276,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Nome&amp;nbsp;dell’identità</translation>
     </message>
@@ -10439,20 +11290,16 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished">Nodo</translation>
     </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">Firmato&amp;nbsp;da</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Scononsciuto]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10464,7 +11311,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10512,13 +11359,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Sto caricando...</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10650,6 +11501,10 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation type="unfinished">Popolarità</translation>
     </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Dettagli</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -10659,7 +11514,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+31"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished">Contatto sconosciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+42"/>
@@ -10669,7 +11524,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+15"/>
         <source>Unknown</source>
-        <translation type="unfinished">Scononsciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+54"/>
@@ -10682,6 +11537,29 @@ This message is missing. You should receive it later.</source>
         <translation>No</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">ID tunnel: %1</translation>
+    </message>
+    <message>
+        <source>from: %1</source>
+        <translation type="vanished">da: %1</translation>
+    </message>
+    <message>
+        <source>to: %1</source>
+        <translation type="vanished">a: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">stato: %1</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Nodo sconosciuto</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10899,7 +11777,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10915,7 +11793,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Autori</translation>
     </message>
@@ -10934,7 +11812,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -11012,7 +11890,7 @@ p, li { white-space: pre-wrap; }
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11022,7 +11900,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11050,7 +11928,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11060,7 +11938,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Copia nel PortaBlocco il Certificato</translation>
     </message>
@@ -11070,7 +11948,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Salva il tuo certificato in un File</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>Invia via email</translation>
     </message>
@@ -11090,37 +11968,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11132,12 +11986,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11152,7 +12006,12 @@ new short format</source>
         <translation>Invito RetroShare</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation>Salva come...</translation>
     </message>
@@ -11417,14 +12276,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Tutto</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Reputazione</translation>
     </message>
@@ -11434,12 +12293,12 @@ p, li { white-space: pre-wrap; }
         <translation>Cerca</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>Id Anonimo</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Crea nuova identità</translation>
     </message>
@@ -11449,7 +12308,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11464,27 +12323,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Voti positivi</translation>
     </message>
@@ -11500,39 +12359,29 @@ p, li { white-space: pre-wrap; }
         <translation>Voti negativi</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Circoli</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Nome della cerchia</translation>
     </message>
@@ -11552,20 +12401,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Circoli personali</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Modifica Identità</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Cancella identità</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Conversa con questo contatto</translation>
     </message>
@@ -11575,78 +12422,78 @@ p, li { white-space: pre-wrap; }
         <translation>Avvia una conversazione a distanza con questo contatto</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation>ID nodo proprietario :</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Nome dell’identità :</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>ID dell&apos;identità</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Invia Messaggio</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Info sull&apos;identità</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>ID dell’identità :</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Nome nodo proprietario :</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Manda invito</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Opinione media dei nodi adiacenti riguardo questa identità. Negativa è male,&lt;/p&gt;&lt;p&gt;positiva è buono. Zero è neutrale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>La tua opinione:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Negativo</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>Neutrale</translation>
     </message>
@@ -11657,17 +12504,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positivo</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Punteggio complessivo della reputazione, tenendo conto del tuo voto e quello dei tuoi amici.&lt;/p&gt;&lt;p&gt;Negativo è male, positivo è bene. Zero è neutrale. Se il punteggio è troppo basso, l’identità viene marchiata come pessima, e sarà filtrata via nei forum, nelle aree di conversazione, nei canali, ecc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Complessivo:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anonimo</translation>
     </message>
@@ -11682,24 +12529,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Questa identità ti appartiene</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>Le mie identità</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11714,12 +12561,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11729,7 +12571,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11804,7 +12646,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>ID dell&apos;identità:</translation>
     </message>
@@ -11834,7 +12676,7 @@ p, li { white-space: pre-wrap; }
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11849,7 +12691,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished">Modifica Circolo</translation>
     </message>
@@ -11897,7 +12739,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11905,7 +12747,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11948,7 +12790,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Identità anonima</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12028,7 +12870,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12044,12 +12886,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Bloccato</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation>positivo</translation>
     </message>
@@ -12098,6 +12945,10 @@ These identities will soon be not supported anymore.</source>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Sconosciuto</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12154,7 +13005,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12204,21 +13055,21 @@ These identities will soon be not supported anymore.</source>
         <translation>Ciao,&lt;br&gt;vorrei essere tuo amico sul network RetroShare.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Persone</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Il Tuo Avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>Collegato a nodi adiacenti</translation>
     </message>
@@ -12228,7 +13079,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Collegato a nodi distanti</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Collegato a un nodo RetroShare tuo amico</translation>
     </message>
@@ -12243,7 +13094,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Collegato a un nodo RetroShare sconosciuto</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Conversa con questa persona</translation>
     </message>
@@ -12258,12 +13109,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Conversazione a distanza con questa persona: rifiutata.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>Ultimo utilizzo:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 PGP Conosciuta</translation>
     </message>
@@ -12283,12 +13134,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Vuoi davvero eliminare questa identità?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Appartenente a</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Nome nodo:</translation>
     </message>
@@ -12298,7 +13149,7 @@ These identities will soon be not supported anymore.</source>
         <translation>ID Nodo :</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>Cancellare davvero?</translation>
     </message>
@@ -12306,7 +13157,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Soprannome</translation>
     </message>
@@ -12336,7 +13187,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudonimo</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12346,19 +13197,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Nuova identità</translation>
     </message>
@@ -12372,7 +13216,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12382,12 +13226,7 @@ These identities will soon be not supported anymore.</source>
         <translation>N/D</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Modifica Identità</translation>
@@ -12398,27 +13237,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Aggiorna</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12438,7 +13277,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12448,7 +13287,11 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Errore ricevendo la chiave!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Errore KeyId non valido</translation>
     </message>
@@ -12463,7 +13306,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Nome reale sconosciuto</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Crea Nuova Identità</translation>
     </message>
@@ -12473,15 +13316,10 @@ These identities will soon be not supported anymore.</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Rimuovi</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12507,7 +13345,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Crea</translation>
     </message>
@@ -12517,13 +13355,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Il Tuo Avatar</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Imposta Avatar</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>Collegato al tuo profilo</translation>
     </message>
@@ -12533,7 +13375,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Puoi avere una o più identità. Vengono impiegate quando scrivi nelle aree di discussione, sui forum e per i commenti nei canali. Fungono da destinazione per le conversazioni a distanza e per il sistema postale a distanza di RetroShare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Nickname troppo corto. Inserisci almeno %1 caratteri.</translation>
     </message>
@@ -12592,6 +13434,10 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>Nome PGP:</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">id GXS:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12607,7 +13453,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
@@ -12617,12 +13463,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Contrassegna tutto</translation>
     </message>
@@ -12641,38 +13487,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Cita</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Invia</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Salva immagine</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12690,32 +13524,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Porta:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Stato:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12736,12 +13565,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12750,31 +13574,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Aprire file</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Apri cartella</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Verifica...</translation>
     </message>
@@ -12784,7 +13603,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Verifica file</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12812,7 +13631,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Aggiungi amico</translation>
     </message>
@@ -12828,8 +13647,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
@@ -12850,7 +13668,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
@@ -12861,12 +13679,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Auto configuratore rapido</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 una piattaforma di comunicazione sicura decentralizzata</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Non finito</translation>
     </message>
@@ -12893,12 +13711,11 @@ Libera un po&apos; di spazio e clicca OK.</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Notifica</translation>
     </message>
@@ -12909,35 +13726,31 @@ Libera un po&apos; di spazio e clicca OK.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Apri messaggi</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Grafico banda passante</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Riduci</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Ingrandisci</translation>
     </message>
@@ -12952,12 +13765,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 nuovo messaggio</translation>
     </message>
@@ -12987,7 +13795,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>amici connessi %1</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Vuoi davvero uscire da RetroShare?</translation>
     </message>
@@ -13007,7 +13815,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Accertati che questo link non sia stato creato per condurti a siti malevoli.</translation>
     </message>
@@ -13052,13 +13860,12 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Matrice dei permessi sui servizi</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Statistiche</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Mostra interfaccia web</translation>
     </message>
@@ -13073,7 +13880,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>Uscire davvero?</translation>
     </message>
@@ -13082,17 +13889,17 @@ Libera un po&apos; di spazio e clicca OK.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Componi</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Paragrafo</translation>
     </message>
@@ -13128,12 +13935,12 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Titolo 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Dimensione carattere</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Ingrandisci carattere</translation>
     </message>
@@ -13148,32 +13955,32 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Grassetto</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Corsivo</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Allinemento</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Aggiungere un&apos;immagine</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Predefinisci il carattere di testo con stile di codice</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Sottolinea</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Oggetto: </translation>
     </message>
@@ -13184,32 +13991,32 @@ Libera un po&apos; di spazio e clicca OK.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Etichette</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Imposta colore del testo</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Imposta colore di sfondo del testo</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Files raccomandati</translation>
     </message>
@@ -13279,7 +14086,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Aggiungi citazione</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Invia a:</translation>
     </message>
@@ -13314,7 +14121,7 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>Contatti</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Ciao, &lt;br&gt;ti raccomando un mio buon amico; ci si può fidare di lui quanto di me. &lt;br&gt;</translation>
     </message>
@@ -13334,19 +14141,19 @@ Libera un po&apos; di spazio e clicca OK.</translation>
         <translation>vuole essere amico con te su RetroShare</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hi %1,&lt;br&gt;&lt;br&gt;%2 vuole esserti amico su RetroShare.&lt;br&gt;&lt;br&gt;Rispondi ora:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Grazie,&lt;br&gt;Il Team RetroShare
 </translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Salva messaggio</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Messaggio non inviato
@@ -13358,17 +14165,7 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Incolla collegamento RetroShare</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Aggiungi in &quot;A:&quot;</translation>
     </message>
@@ -13388,7 +14185,7 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Aggiungi come raccomandato</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Messaggio Originale</translation>
     </message>
@@ -13398,21 +14195,21 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Da</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Inviato</translation>
     </message>
@@ -13427,7 +14224,7 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Su %1, %2 scrive:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13437,30 +14234,30 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Inoltra:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Invio messaggio senza oggetto?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Inserisci almeno un destinatario.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>BCC</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Scononsciuto</translation>
     </message>
@@ -13575,13 +14372,13 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Dettagli</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Apri file ...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-Files (*.htm *.html);;Tutti Files (*)</translation>
     </message>
@@ -13601,7 +14398,7 @@ Vuoi salvarlo nelle bozze?</translation>
         <translation>Esporta PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Messaggio non inviato.
@@ -13623,7 +14420,7 @@ Vuoi salvarlo?</translation>
         <translation>Aggiungi File Extra</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Ciao,&lt;br&gt;vorrei essere tuo amico sul network RetroShare.&lt;br&gt;</translation>
     </message>
@@ -13647,24 +14444,28 @@ Vuoi salvarlo?</translation>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">Hai una richiesta di amicizia</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Rispondi subito:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Da:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>Nodi Amici</translation>
     </message>
@@ -13709,13 +14510,13 @@ Vuoi salvarlo?</translation>
         <translation>Elenco ordinato (romani maiuscolo)</translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Grazie, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Identità distante:</translation>
     </message>
@@ -13725,12 +14526,12 @@ Vuoi salvarlo?</translation>
         <translation>[Mancante]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Devi crearti un’identità per firmare i messaggi a distanza, altrimenti rimuovi i contatti a distanza dalla lista di destinazione.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Nome &amp; ID nodo:</translation>
     </message>
@@ -13808,7 +14609,7 @@ Vuoi salvarlo?</translation>
         <translation>Predefinito</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Una nuova cartella</translation>
     </message>
@@ -13818,7 +14619,7 @@ Vuoi salvarlo?</translation>
         <translation>Una nuova finestra</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Modifica etichetta</translation>
     </message>
@@ -13841,7 +14642,7 @@ Vuoi salvarlo?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Sotto:</translation>
     </message>
@@ -13849,7 +14650,7 @@ Vuoi salvarlo?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Messaggio</translation>
     </message>
@@ -13877,7 +14678,7 @@ Vuoi salvarlo?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Files raccomandati</translation>
     </message>
@@ -13887,37 +14688,37 @@ Vuoi salvarlo?</translation>
         <translation>Scarica tutti i files raccomandati</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Oggetto: </translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Da:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Copia a:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Etichette:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Rispondi</translation>
     </message>
@@ -13957,7 +14758,7 @@ Vuoi salvarlo?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>Manda invito</translation>
     </message>
@@ -14009,7 +14810,7 @@ Vuoi salvarlo?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Conferma %1 come amico</translation>
     </message>
@@ -14019,12 +14820,12 @@ Vuoi salvarlo?</translation>
         <translation>Aggiungi %1 come amico</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Nessun oggetto</translation>
     </message>
@@ -14034,22 +14835,17 @@ Vuoi salvarlo?</translation>
         <translation>Scarica</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14058,24 +14854,14 @@ Vuoi salvarlo?</translation>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Scarica tutto</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Stampa Documento</translation>
     </message>
@@ -14090,12 +14876,12 @@ Vuoi salvarlo?</translation>
         <translation>HTML-Files (*.htm *.html);;Tutti Files (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Carica sempre le immagini per questo messaggio</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Nascondi pannello allegati</translation>
     </message>
@@ -14117,6 +14903,42 @@ Vuoi salvarlo?</translation>
         <source>Compose</source>
         <translation>Compose</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Rispondi al messaggio selezionato</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Rispondi</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Rispondi a tutti i messaggi</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Rispondi a tutti</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Inoltra messaggio selezionato</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Avanti</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Rimuovi messaggio selezionato</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Cancella</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Stampa messaggio selzionato</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14195,7 +15017,7 @@ Vuoi salvarlo?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Nuovo messaggio</translation>
     </message>
@@ -14205,16 +15027,60 @@ Vuoi salvarlo?</translation>
         <translation>Componi</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Rispondi al messaggio selezionato</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Rispondi</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Rispondi a tutti i messaggi</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Rispondi a tutti</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Inoltra messaggio selezionato</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Inoltra:</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Rimuovi messaggio selezionato</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Cancella</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Stampa messaggio selzionato</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Stampa</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Mostra</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Etichette</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Casella di posta:</translation>
@@ -14244,17 +15110,21 @@ Vuoi salvarlo?</translation>
         <translation>Cestino</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Totale ricezione:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Cartelle</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Panoramica</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Stampa...</translation>
@@ -14264,6 +15134,26 @@ Vuoi salvarlo?</translation>
         <source>Print Preview</source>
         <translation>Anteprima stampa</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Solo icone bottoni</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Testo bottoni accanto alle icone</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Bottoni con testo</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Testo bottoni sotto le icone</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Predisponi testo sotto icone</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14285,7 +15175,7 @@ Vuoi salvarlo?</translation>
         <translation>Inoltra messaggio</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Oggetto</translation>
     </message>
@@ -14295,7 +15185,7 @@ Vuoi salvarlo?</translation>
         <translation>Da</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
@@ -14305,7 +15195,39 @@ Vuoi salvarlo?</translation>
         <translation>Contenuti</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Clicca per ordinare per allegato</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Clicca per ordinare per oggetto</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Clicca per ordinare per lettura</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Clicca per ordinare per mittente</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Clicca per ordinare per data</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Clicca per ordinare per etichetta</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Clicca per ordinare per evidenziatura</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Inoltra messaggio selezionato</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Oggetto 
 ricerca</translation>
@@ -14315,11 +15237,6 @@ ricerca</translation>
         <source>Search From</source>
         <translation>Ricerca da</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14346,14 +15263,14 @@ ricerca</translation>
         <translation>Ricerca allegati</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messaggi&lt;/h1&gt;                          &lt;p&gt;RetroShare ha un suo sistema postale email interno. Puoi inviare/ricevere email a/da nodi amici a cui sei connesso.&lt;/p&gt;  &lt;p&gt;È altresì possibile inviare messaggi alle Identità altrui utilizzando il sistema di instradazione globale. Questi messaggi sono sempre crittografati e firmati, e vengono reinstradati da nodi intermedi finché non raggiungono la destinazione finale.&lt;/p&gt;    &lt;p&gt;I messaggi a distanza rimangono nella tua Casella in Uscita fin quando non ricevono una ricevuta di confermata consegna.&lt;/p&gt; &lt;p&gt;Generalmente, puoi utilizzare i messaggi per raccomandare file ai tuoi amici, incollandovi i link ai file, o per raccomandare nodi amici ad altri nodi amici, al fine di irrobustire la tua rete, o per inviare un feedback al titolare di un canale.&lt;/p&gt;                    </translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Evidenziato</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14427,7 +15344,7 @@ ricerca</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14441,7 +15358,7 @@ ricerca</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14456,33 +15373,34 @@ ricerca</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Bozze</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>A</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Messaggi speciali non disponibili. I contrassegni (star) consentono di dare ai messaggi uno status speciale per renderli più facili da trovare. Per contrassegnare  un messaggio, fare clic sulla stella grigia accanto a un qualsiasi messaggio.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Nessun messaggio sistema.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">A</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Clicca per ordinare per</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14490,6 +15408,26 @@ ricerca</translation>
         <source>Total:</source>
         <translation>Totale:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Messaggi</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Clicca per ordinare per firma</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Questo messaggio è stato firmato, e la firma corrisponde</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Questo messaggio è stato firmato, ma la firma non corrisponde</translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">Questo messaggio proviene da una persona distante</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14517,17 +15455,7 @@ ricerca</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">Salva immagine</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Incolla come testo non formattato</translation>
     </message>
@@ -14581,7 +15509,7 @@ ricerca</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -14591,7 +15519,7 @@ ricerca</translation>
         <translation>Rimuovi elemento</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished">Da</translation>
     </message>
@@ -14626,7 +15554,7 @@ ricerca</translation>
         <translation>Messaggio in attesa</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
@@ -14767,7 +15695,7 @@ ricerca</translation>
         <translation>ID contatto</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Rimuovi chiavi non usate...</translation>
     </message>
@@ -14777,7 +15705,7 @@ ricerca</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Pulisci il portachiavi</translation>
     </message>
@@ -14795,13 +15723,7 @@ Nota: Il tuo vecchio portachiavi sarà salvato.
 La rimozione potrebbe fallire quando istanze multiple di Retroshare sono in esecuzione sulla stessa macchina.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Informazioni sul Portachiavi</translation>
@@ -14837,13 +15759,18 @@ Per sicurezza, il tuo portachiavi è stato precedentemente salvato su di un file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Inconsistenza nei dati nel portachiavi. Questo è molto probabilmente un bug. Per favore contatta gli sviluppatori.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>Esporta/crea un nuovo nodo</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Solo chiavi fidate</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Cerca nome</translation>
     </message>
@@ -14853,12 +15780,12 @@ Per sicurezza, il tuo portachiavi è stato precedentemente salvato su di un file
         <translation>Ricerca ID contatto</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14867,6 +15794,13 @@ Reported error:</source>
 Errore riportato:</translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Rete</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14893,7 +15827,7 @@ Errore riportato:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14914,7 +15848,7 @@ Errore riportato:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Gruppi</translation>
     </message>
@@ -14944,19 +15878,19 @@ Errore riportato:</translation>
         <translation type="unfinished">Esporta il tuo elenco amici, inclusi i gruppi</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14966,12 +15900,12 @@ Errore riportato:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14981,7 +15915,7 @@ Errore riportato:</translation>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Gruppo</translation>
     </message>
@@ -15096,7 +16030,7 @@ Errore riportato:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Vuoi rimuovere questo nodo?</translation>
     </message>
@@ -15106,7 +16040,7 @@ Errore riportato:</translation>
         <translation type="unfinished">Vuoi rimuovere questo amico?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Fatto!</translation>
@@ -15220,7 +16154,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15235,7 +16169,11 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Rimuovi tutto</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Questo è un test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>Più recenti in cima</translation>
     </message>
@@ -15245,12 +16183,12 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Più vecchi in cima</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15305,6 +16243,10 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Sicurezza</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15326,6 +16268,10 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <source>Message</source>
         <translation>Messaggio</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Tentativo connessione</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15352,6 +16298,10 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <source>Circles</source>
         <translation type="unfinished">Circoli</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Link</translation>
+    </message>
     <message>
         <location line="+35"/>
         <source>Mails</source>
@@ -15480,16 +16430,24 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Disabilita temporaneamente tutte le notifiche del Toaster</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Dispaccio</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Riquadro sistema</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">Conta tutti i messaggi non letti</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15509,12 +16467,12 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Password errata !</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Plugin/eseguibile non registrato</translation>
     </message>
@@ -15529,7 +16487,19 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
         <translation>Per favore controlla l&apos;orologio di sistema.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Esame files condivisi...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Calcolando l&apos; hash del file</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Salvataggio indice file...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15540,19 +16510,17 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Titolo sconosciuto</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Messaggio criptato</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Perché le aree di discussione funzionino correttamente, l&apos;orario del tuo computer deve essere corretto. Per favore controlla che questo sia il tuo caso (Una probabile differenza di diversi minuti è stata rilevata con i tuoi amici).</translation>
     </message>
@@ -15560,7 +16528,7 @@ uno o più peer non sono stati aggiunti ad un gruppo</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Amico online</translation>
     </message>
@@ -15612,6 +16580,10 @@ Basso Traffico: 10% di traffico standard e TODO: sospende tutti i trasferimenti
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Dialogo</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15677,6 +16649,10 @@ Basso Traffico: 10% di traffico standard e TODO: sospende tutti i trasferimenti
         <source>This profile has signed your own profile key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Firme chiave :</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15702,20 +16678,23 @@ p, li { white-space: pre-wrap; }
         <translation>Chiave PGP</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
+        <location line="+47"/>
+        <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <source>These options apply to all nodes of the profile:</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Firmare la chiave di un amico è un modo di esprimergli la tua fiducia davanti agli altri amici. Li aiuta a decidere quando accettare connessioni basate su quella chiave, fidandosi di te. Firmare una chiave è assolutamente facoltativo e la firma non si può revocare, quindi scegli saggiamente quando farlo.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Firma Chiave PGP</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15752,7 +16731,12 @@ p, li { white-space: pre-wrap; }
         <translation>Includi firme</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Opzioni</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare cerca periodicamente, nelle liste dei tuoi amici, files corrispondenti ai tuoi trasferimenti, così da poter stabilire dei trasferimenti diretti. In questo caso, il tuo amico saprà che tu stai scaricando uno dei suoi files.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Per prevenire questo comportamento solo per questo amico, deseleziona questa opzione. Puoi comunque effettuare un trasferimento diretto se lo richiedi esplicitamente, ad es. scaricando qualcosa dalla lista di files del tuo amico. Questa impostazione è applicata a tutte le locazioni dello stesso nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -15766,6 +16750,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questa opzione ti permette di scaricare automaticamente un file raccomandato in un qualche messaggio arrivato da questo nodo. Può essere utile, ad esempio, per inviare files tra i tuoi nodi. L&apos;opzione viene applicata a tutte le locazioni dello stesso nodo.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15798,21 +16786,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Errore: impossibile ottenere dettagli contatto</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>L&apos;algoritmo a chiave fornito non è supportato da RetroShare (chiavi RSA solo sono supportate al momento)</translation>
@@ -15830,7 +16818,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Il livello di fiducia è un modo per esprimere la fiducia che riponi in questa chiave. Non viene utilizzato dal programma, né viene condiviso, ma può esserti utile a ricordare le chiavi buone e quelle cattive.</translation>
     </message>
@@ -15899,6 +16887,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Forse la password è sbagliata</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15906,12 +16898,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>Profilo Retroshare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Questa è la tua chiave PGP, ed è firmata da : </translation>
     </message>
@@ -15937,7 +16929,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Conversazione</translation>
     </message>
@@ -15958,7 +16950,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Rimuovi elemento</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -15998,7 +16990,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Scrivi messaggio</translation>
     </message>
@@ -16012,6 +17004,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Amico connesso</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Tentativo connessione</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16048,7 +17044,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+1"/>
         <location line="+1"/>
         <source>Unknown</source>
-        <translation type="unfinished">Scononsciuto</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Contatto sconosciuto</translation>
     </message>
     <message>
         <location line="+106"/>
@@ -16056,7 +17056,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Invia Messaggio</translation>
     </message>
@@ -16223,6 +17223,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Modulo</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16230,11 +17237,23 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>Sondivisione Foto</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Foto</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Etichetta Testo</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Commento</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Riassunto</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16295,6 +17314,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Aggiungi un commento</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Scrivi un commento...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16361,6 +17388,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Creare Album</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Vista Album</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16382,17 +17413,17 @@ p, li { white-space: pre-wrap; }
         <translation>Proiezione</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Miei album</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Album Sottoscritti</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Album condivisi</translation>
     </message>
@@ -16421,7 +17452,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Nome album</translation>
     </message>
@@ -16480,19 +17511,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16528,12 +17559,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>EtichettaTesto</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Visualizza ulteriori dettagli su questo plugin</translation>
     </message>
@@ -16679,6 +17710,59 @@ Altro...
         <source>Plugin look-up directories</source>
         <translation>Cartella scorcio moduli aggiuntivi</translation>
     </message>
+    <message>
+        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
+        <translation type="vanished">Plugin disattivato. Cliccare il bottone &quot;attiva&quot; e riavviare RetroShare.</translation>
+    </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[disattivato]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Nessun numero di API in dotazione. Si prega di leggere manuale di sviluppo  plugin.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[problema di caricamento]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Nessun numero SVN in dotazione. Si prega di leggere manuale di sviluppo  plugin.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Errore caricamento.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Simbolo errato. Versione sbagliata?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Nessun oggetto modulo aggiuntivo</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Modulo aggiuntivo caricato.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Stato sconosciuto.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Abilita se stai sviluppando dei plugins.
+Su di essi non verrà effettuato il controllo dell&apos;hash.
+Per il normale utilizzo abilitare il controllo dell&apos;hash ti protegge plugin contraffatti.</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;I Plugin&lt;/h1&gt;                   &lt;p&gt;I plugins vengono caricati dalle cartelle elencate nella lista sottostante.&lt;/p&gt;&lt;p&gt;Per motivi di sicurezza, i plugin accettati vengono caricati automaticamente fino a quando non vengono modificati l&apos;eseguibile principale di RetroShare o la libreria dei plugin. In tal caso, l&apos;utente dovrà riconfermarli. Dopo l&apos;avvio del programma, puoi abilitare manualmente un plugin cliccando sul bottone &quot;Abilita&quot; e riavviando RetroShare.&lt;/p&gt;                                            &lt;p&gt;Se vuoi sviluppare un tuo plugin, contatta il team degli sviluppatori, saranno felici di aiutarti!&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16748,27 +17832,12 @@ Altro...
         <translation>Disponi finestra in cima</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">Banna persona (esprimi ufficialmente parere negativo)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished">Esprimi parere neutro</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished">Esprimi parere positivo</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16802,6 +17871,14 @@ Altro...
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Chiudere questa finestra terminerà la conversazione, verrà notificato all&apos;altro peer e rimuoverà il tunnel cifrato.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Terminare il tunnel?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16821,7 +17898,7 @@ Altro...
         <translation type="unfinished">Nuovo</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Vota per</translation>
     </message>
@@ -16841,8 +17918,8 @@ Altro...
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Commenti</translation>
     </message>
@@ -16867,13 +17944,13 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Commento</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16901,12 +17978,20 @@ Altro...
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Firmato da:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Note</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16921,22 +18006,12 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Carica un file immagine</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16952,17 +18027,7 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16972,7 +18037,23 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Inviare Post</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">Stai proponendo un link. La chiave per una proposizione di successo è: contenuti interessanti, e un titolo descrittivo.</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Invia</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Invia un nuovo Post</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Aggiungi un Titolo</translation>
     </message>
@@ -16992,22 +18073,12 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17022,7 +18093,7 @@ Altro...
         <translation type="unfinished">Pubblica come</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17033,7 +18104,7 @@ Altro...
         <translation type="unfinished">Immagine</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17043,7 +18114,7 @@ Altro...
         <translation>Titolo</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Collegamento</translation>
     </message>
@@ -17051,12 +18122,40 @@ Altro...
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Link Postato</translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Crea Argomento</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Miei argomenti</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Argomenti sottoscritti</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Argomenti popolari</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Altri argomenti</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Link</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17090,7 +18189,31 @@ Altro...
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Argomento inviato</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Aggiungi Amministratore degli Argomenti</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Seleziona Amministratore degli Argomenti</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Crea Nuovo Argomento</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Modifica Argomento</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Aggiorna Argomento</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17128,17 +18251,7 @@ Altro...
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17154,7 +18267,7 @@ Altro...
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -17169,17 +18282,16 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Loading</source>
+        <translation type="vanished">Sto caricando...</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">Mai</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17192,18 +18304,22 @@ Altro...
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Sito</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Commenti</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17214,12 +18330,12 @@ Altro...
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Commento</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17229,7 +18345,7 @@ Altro...
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;L’autore di questo messaggio (con ID %1) è bloccato.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17239,17 +18355,21 @@ Altro...
         <translation type="unfinished">Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Vota per</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Vota contro</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Definisci letto e rimuovi elemento</translation>
     </message>
@@ -17259,7 +18379,7 @@ Altro...
         <translation>Nuovo</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Nuovo commento:</translation>
     </message>
@@ -17269,7 +18389,7 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -17310,10 +18430,77 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Sto caricando...</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Da</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Modulo</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Scottante</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nuovo</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">In alto</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Oggi</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Ieri</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Questa settimana</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Questo mese</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Quest&apos;anno</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Invia un nuovo Post</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Successivo</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Per favore crea o scegli un Id per firmare prima di votare</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Precedente</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17333,17 +18520,7 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17353,15 +18530,15 @@ Altro...
         <translation type="unfinished">Amministratore:</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">sconosciuto</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished">Distribuzione:</translation>
     </message>
@@ -17371,42 +18548,42 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">Post</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17426,7 +18603,7 @@ Altro...
         <translation type="unfinished">Scottante</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17456,17 +18633,17 @@ Altro...
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17481,17 +18658,12 @@ Altro...
         <translation type="unfinished">Vuoto</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17501,31 +18673,27 @@ Altro...
         <translation type="unfinished">Modifica</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17540,7 +18708,7 @@ Altro...
         <translation type="unfinished">Entra</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">Mai</translation>
     </message>
@@ -17582,7 +18750,7 @@ Altro...
     <message>
         <location line="+2"/>
         <source>Unknown</source>
-        <translation type="unfinished">Scononsciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+32"/>
@@ -17614,16 +18782,6 @@ Altro...
         <source>No Channel Selected</source>
         <translation type="unfinished">Nessun Canale Selezionato</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17632,6 +18790,10 @@ Altro...
         <source>Tabs</source>
         <translation>Tabs</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Apri ciascun argomento in una nuova scheda</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17645,6 +18807,10 @@ Altro...
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Pubblicato</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17713,16 +18879,16 @@ Altro...
         <translation>Gestore Profilo</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17832,7 +18998,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Modificare il messaggio di stato</translation>
@@ -17848,7 +19014,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>Gestore Profilo</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Informazioni pubbliche</translation>
     </message>
@@ -17883,12 +19049,12 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation>in linea dal:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Altre informazioni</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Il mio indirizzo</translation>
     </message>
@@ -17932,27 +19098,51 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Post da:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Conto 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Conto 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Conto 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Aggiungere al segnale</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">filtro</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">Aggiunge URL</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Visualizzare come</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17962,12 +19152,12 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished">Da:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17997,13 +19187,13 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished">Negativo</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18015,22 +19205,12 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18039,13 +19219,17 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Manda un segnale sul filo</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18060,24 +19244,34 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Carica un file immagine</translation>
+        <source>From</source>
+        <translation type="vanished">Da</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Data</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18088,7 +19282,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18107,7 +19301,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18117,7 +19311,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18144,7 +19338,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18154,7 +19348,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18174,7 +19368,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18290,7 +19484,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18298,42 +19492,37 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18365,7 +19554,7 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18373,8 +19562,8 @@ Ora puoi copiarla su un altro computer e utilizzare il pulsante Importa per cari
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Conferma</translation>
     </message>
@@ -18644,12 +19833,12 @@ Caratteri &lt;b&gt;&quot;, |, \, &amp;lt;&amp;gt;,, *,?&lt;/b&gt; saranno sostit
         <translation>Dettagli contatto</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Richiesta file cancellata</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Questa versione di RetroShare usa OpenPGP-SDK. Come effetto collaterale, non utilizza il portachiavi PGP condiviso di sistema, ma ha il proprio portachiavi condiviso da tutte le istanze di RetroShare. &lt;br&gt;&lt;br&gt;Non sembri avere un tale portachiavi, sebbene chiavi PGP siano menzionati da account RetroShare esistenti, probabilmente perché hai appena cambiato per questa nuova versione del software.</translation>
     </message>
@@ -18680,7 +19869,7 @@ Caratteri &lt;b&gt;&quot;, |, \, &amp;lt;&amp;gt;,, *,?&lt;/b&gt; saranno sostit
         <translation>Errore inatteso. Riferisci &quot;RsInit::InitRetroShare unexpected return code %1&quot;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18714,7 +19903,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Istanze multiple</translation>
@@ -18738,26 +19927,6 @@ Blocca file.
 Blocco del file:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18840,7 +20009,7 @@ L’errore segnalato è:
         <translation>Inoltro dati</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Sembri avere nodi associati a chiavi DSA:</translation>
     </message>
@@ -18850,7 +20019,7 @@ L’errore segnalato è:
         <translation>Chiavi DSA non sono ancora supportate da questa versione di RetroShare. Tutti questi nodi saranno inutilizzabili. Siamo molto spiacenti per questo.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>abilitato</translation>
     </message>
@@ -18860,7 +20029,7 @@ L’errore segnalato è:
         <translation>disabilitato</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Sposta l’IP %1 alla lista bianca</translation>
     </message>
@@ -18876,7 +20045,7 @@ L’errore segnalato è:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>%1 secondi fa</translation>
     </message>
@@ -18943,7 +20112,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18971,7 +20140,7 @@ Security: no anonymous IDs</source>
         <translation>impossibile analizzare il file XML!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19151,29 +20320,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Nome</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Nodo</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19244,7 +20397,7 @@ Security: no anonymous IDs</source>
         <location line="+12"/>
         <location line="+33"/>
         <source>Unknown</source>
-        <translation type="unfinished">Scononsciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -19366,6 +20519,10 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Questo certificato contiene:</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19416,18 +20573,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19590,7 +20735,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Tutta la rete</translation>
     </message>
@@ -19773,7 +20918,7 @@ p, li { white-space: pre-wrap; }
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Caricamento immagini bloccato</translation>
     </message>
@@ -19786,7 +20931,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Concesso di default</translation>
     </message>
@@ -19959,22 +21104,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">Salva immagine</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19982,12 +21117,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20679,7 +21814,7 @@ Se ritieni sia corretto, rimuovi dal file la riga corrispondente e ri-aprilo con
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Nome</translation>
@@ -20794,13 +21929,13 @@ Se ritieni sia corretto, rimuovi dal file la riga corrispondente e ri-aprilo con
     <message>
         <location line="+1"/>
         <source>Unknown</source>
-        <translation type="unfinished">Scononsciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Nome</translation>
     </message>
@@ -20820,7 +21955,7 @@ Se ritieni sia corretto, rimuovi dal file la riga corrispondente e ri-aprilo con
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20876,7 +22011,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Messaggio Redatto ... ]</translation>
     </message>
@@ -20890,6 +22025,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Messaggio Perso ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20903,11 +22043,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Da</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished">A</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20930,18 +22065,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Clicca per ordinare per lettura</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Clicca per ordinare per mittente</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20964,9 +22094,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20987,7 +22115,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Ripristina TUTTI i parametri Retroshare memorizzati</translation>
     </message>
@@ -21048,7 +22176,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Definisci lingua RetroShare</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Impossibile aprire file di LOG &apos;%1&apos;: %2</translation>
     </message>
@@ -21069,7 +22197,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Impossibile creare la cartella dati: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Revisione</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21099,7 +22231,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>Codice linguaggio incorretto:</translation>
     </message>
@@ -21117,7 +22249,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21134,12 +22266,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Immetti una chiave (di almeno 3 caratteri)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Inizia ricerca</translation>
     </message>
@@ -21200,7 +22332,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Parole Chiave</translation>
     </message>
@@ -21215,7 +22347,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Rierca ID</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Nome File</translation>
     </message>
@@ -21315,23 +22447,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Scarica selezionati</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Nome File</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Scarica</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Copia collegamento RetroShare</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Invia collegamento RetroShare</translation>
     </message>
@@ -21341,7 +22473,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Scarica Informativa</translation>
     </message>
@@ -21378,7 +22510,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Rimuovi tutto</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Cartella</translation>
@@ -21389,17 +22521,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nuovo collegamento(i) RetroShare</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Apri cartella</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Crea Raccolta...</translation>
     </message>
@@ -21419,7 +22551,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Scarica da una raccolta di file...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Raccolta</translation>
     </message>
@@ -21427,7 +22559,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Dettagli contatto</translation>
     </message>
@@ -21443,22 +22575,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Rimuovi Elemento</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>Indirizzo IP:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>ID contatto:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Località:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Nome contatto:</translation>
     </message>
@@ -21475,7 +22607,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Nascondi</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21500,8 +22632,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Questo è l’IP a cui il tuo amico sostiene di essere connesso. Se avete appena cambiato gli IP, allora questo è un falso allarme. Altrimenti, significa che la tua connessione a questo amico è inoltrata da un peer intermedio, ed è una cosa sospetta.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo avviso serve a proteggerti dagli attacchi tramite inoltro del traffico. In simili casi, l’amico a cui sei connesso non vedrà il tuo IP esterno, vedrà invece l’IP di chi esegue l’attacco.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Però, se per qualche motivo avete appena cambiato gli IP (alcuni ISP ti cambiano l’IP a intervalli regolari), allora questo avviso ti sta solo dicendo che un amico si è connesso al tuo nuovo IP prima che RetroShare si sia accorto che l’IP è cambiato. In questo caso, non c’è nulla che non vada.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Puoi facilmente evitare falsi allarmi mettendo in lista bianca i tuoi indirizzi IP (p.es. l’intervallo dei tuoi IP), o disabilitando del tutto questi avvisi in Opzioni-&amp;gt;Notifica-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -21509,7 +22641,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>vuole essere amico con te su RetroShare</translation>
     </message>
@@ -21540,7 +22672,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Allarga</translation>
     </message>
@@ -21585,12 +22717,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Stato:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Scrivi messaggio</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Tentativo Connessione</translation>
     </message>
@@ -21610,24 +22742,19 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Tentativi di connessione sconosciuto (uscente)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Evento di sicurezza sconosciuto</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
-        <translation type="unfinished">Scononsciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
@@ -21635,7 +22762,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Contatto sconosciuto</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Nascondi</translation>
     </message>
@@ -21645,7 +22776,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Vuoi rimuovere questo amico?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Il Certificato ha una firma errata!! Questo contatto non è chi afferma di essere.</translation>
     </message>
@@ -21655,12 +22786,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Certificato Mancante/Danneggiato. Non è un vero utente RetroShare.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>Il certificato ha causato un errore interno.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Peer/nodo non in lista-amici (PGP id=</translation>
     </message>
@@ -21719,12 +22850,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Indirizzo Locale</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21745,22 +22876,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Porta:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Rete locale</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Rilevatore di indirizzo IP esterno</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>IP conosciuti / precedenti:</translation>
     </message>
@@ -21773,16 +22904,21 @@ behind a firewall or a VPN.</source>
         <translation>Se si deseleziona questo, RetroShare può determinare solo il tuo IP quando si connette a qualcuno. Lasciare questo selezionato, aiuta a connettersi quando si hanno pochi amici. Aiuta anche se sei dietro un firewall o una VPN.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Permetti a RetroShare di chiedere il mio IP a questi siti:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>L’intervallo di porte consentite va da 10 a 65535. In genere le porte al di sotto della 1024 sono riservate al sistema.</translation>
     </message>
@@ -21792,46 +22928,23 @@ behind a firewall or a VPN.</source>
         <translation>L’intervallo di porte consentite va da 10 a 65535. In genere le porte al di sotto della 1024 sono riservate al sistema.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Indirizzo Onion</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Scoperta Attivata (raccomandato)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Scoperta Disattivata</translation>
     </message>
@@ -21841,7 +22954,7 @@ List of found external IP:
         <translation>Nascosto - Vedi Configurazione</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>Indirizzo I2P</translation>
     </message>
@@ -21866,95 +22979,37 @@ List of found external IP:
         <translation>in entrata ok</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>Il proxy sembra funzionare.</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>proxy di I2P non abilitato</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21969,7 +23024,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished">sconosciuto</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21979,7 +23098,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Sei raggiungibile tramite servizio nascosto.</translation>
     </message>
@@ -21993,12 +23127,12 @@ I servizi sono tutti sù e ben funzionanti??
 Controlla anche le tue porte!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Modalità Nascosta]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo azzera la lista degli indirizzi noti. Questa azione è utile se per qualche ragione la tua lista di indirizzi contenesse un indirizzo non valido/irrilevante/scaduto che vorresti evitare di passare ai tuoi amici come indirizzo di contatto.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22008,7 +23142,7 @@ Controlla anche le tue porte!</translation>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>Limite scaricamento (KB/s)</translation>
     </message>
@@ -22023,23 +23157,23 @@ Controlla anche le tue porte!</translation>
         <translation>Limite caricamento (KB/s)</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Il limite di upload copre l’intero software. Un limite di upload troppo piccolo potrebbe eventualmente bloccare i servizi a bassa priorità (forum, canali). Il valore minimo raccomandato è di 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22050,7 +23184,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22060,7 +23204,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22070,7 +23219,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22110,7 +23269,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
@@ -22125,7 +23284,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stop</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">In arrivo</translation>
     </message>
@@ -22161,32 +23325,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished">Relay</translation>
     </message>
@@ -22241,7 +23380,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Totale:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22266,7 +23405,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22278,7 +23417,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>Filtro IP</translation>
     </message>
@@ -22301,7 +23440,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -22361,28 +23500,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Aggiungi alla lista bianca</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Configurazione Servizio Nascosto</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22398,18 +23526,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P in uscita ok</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Indirizzo Servizio</translation>
     </message>
@@ -22444,12 +23572,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>Intervallo IP</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Segnalato dalla DHT per mascheramento IP</translation>
     </message>
@@ -22472,22 +23600,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Aggiunto da te</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gli IP della lista bianca vengono ottenuti dalle seguenti fonti: IP provenienti da un certificato scambiato manualmente; gamme di IP inserite da te in questa finestra o negli elementi immessi nella sicurezza.&lt;/p&gt;&lt;p&gt;Il comportamento di default di RetroShare è di (1) autorizzare sempre la connessione ai peer il cui IP è nella lista bianca, anche se quell’IP appare anche nella lista nera; (2) opzionalmente richiede che gli IP siano nella lista bianca. Puoi modificare questo comportamento per ciascun contatto nella finestra &amp;quot;Dettagli&amp;quot; di ciascun nodo RetroShare. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;La DHT ti consente di rispondere a richieste di connessione dai tuoi amici che usano la DHT di BitTorrent. Migliora notevolmente la connettività. Nessuna informazione viene memorizzata nella DHT; viene impiegata solo come sistema di proxy per entrare in contatto con altri nodi di RetroShare.&lt;/p&gt;&lt;p&gt;Il servizio Discovery invia il nome del nodo e gli ID dei tuoi contatti fidati ai peers connessi, per aiutarli a scegliere nuovi amici. Però l’amicizia non è mai automatica, ed entrambi i peer dovranno pur sempre aggiudicarsi la fiducia a vicenda per consentire la connessione. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Il punto diventa verde non appena RetroShare riesce ad ottenere il tuo IP dai siti elencati qui sotto, se hai abilitato l’operazione. RetroShare utilizzerà anche altri metodi per scoprire il tuo IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questa lista viene compilata automaticamente con informazioni reperite da molteplici fonti: i contatti mascherati segnalati dalla DHT; gli intervalli IP immessi da te; e gli intervalli IP segnalati dai tuoi amici. Le impostazioni di default dovrebbero proteggerti dal relaying del traffico su larga scala.&lt;/p&gt;&lt;p&gt;L&apos;individuazione automatizzata degli IP mascherati potrebbe far finire in lista nera gli IP dei tuoi amici. In questo caso, usa il menù contestuale per metterli in lista bianca.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22522,7 +23650,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Blocca automaticamente gli intervalli degli IP mascherati della DHT che iniziano da</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22532,12 +23660,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks Proxy</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor in uscita ok</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>proxy di Tor non abilitato</translation>
     </message>
@@ -22617,7 +23745,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>verifica i contatti con cui vuoi condividere la chiave privata di pubblicazione</translation>
     </message>
@@ -22627,12 +23755,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Condividi con amici</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Condividi</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Puoi far sapere agli amici del tuo Canale condividendolo con loro.
@@ -22652,7 +23780,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Gestore cartella condivisa</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22672,17 +23800,17 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Visibilità</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">Annulla</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Aggiungi cartella condivisa</translation>
     </message>
@@ -22692,7 +23820,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Applicare e chiudere</translation>
     </message>
@@ -22783,7 +23911,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Cartella non trovata o nome Cartella non accettato.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Questo è un elenco delle cartelle condivise. Puoi aggiungere e rimuovere cartelle usando i bottoni in fondo. Quando aggiungi una nuova cartella, all’inizio tutti i file in essa contenuti vengono condivisi. Puoi impostare separatamente i parametri di condivisione per ciascuna cartella condivisa.</translation>
     </message>
@@ -22791,7 +23919,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Files</translation>
     </message>
@@ -22842,16 +23970,11 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>controllare i file</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Scarica selezionati</translation>
     </message>
@@ -22861,7 +23984,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Scarica</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Copia negli Appunti Collegamenti RetroShare</translation>
     </message>
@@ -22876,7 +23999,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Invia collegamento RetroShare</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22892,7 +24015,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Raccomandazione(i)</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Crea Raccolta...</translation>
     </message>
@@ -22917,7 +24040,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Scarica da una raccolta di file...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23060,12 +24183,12 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Carica configurazione</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Crea interfaccia</translation>
     </message>
@@ -23089,7 +24212,7 @@ Seleziona gli Amici con cui vuoi Condividere il Canale.</translation>
         <translation>Ricorda parola-chiave</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Login</translation>
     </message>
@@ -23442,7 +24565,7 @@ Questa scelta può essere ripristinata in Impostazioni.</translation>
         <translation>Messaggio di stato</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Messaggio:</translation>
     </message>
@@ -23687,7 +24810,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Rimuovi tutte le etichette</translation>
     </message>
@@ -23723,17 +24846,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
-        <translation type="unfinished">Scononsciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -23741,13 +24861,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23757,57 +24882,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Errore</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Non connesso</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23815,7 +24895,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23825,7 +24905,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23836,12 +24916,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23869,7 +24948,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Opzioni traferimento</translation>
@@ -23880,7 +24959,7 @@ p, li { white-space: pre-wrap; }
         <translation>Massimo scaricamenti simultanei:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23890,27 +24969,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Condividi automaticamente cartella ricezione (Raccomandato)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation> minuto(i)</translation>
     </message>
@@ -23995,7 +25069,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24004,12 +25078,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24034,12 +25103,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -24104,7 +25168,12 @@ p, li { white-space: pre-wrap; }
         <translation>Massimo numero di richieste di tunnel inoltrate per secondo:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;costringe il trasferimento a richiedere chunk di file da 1MB in ordine crescente, facilitando l’anteprima durante lo scaricamento. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; è puramente casuale e favorisce lo swarming. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressivo&lt;/span&gt; è un compromesso: seleziona il prossimo chunk casualmente entro un margine che non superi i 50MB di distanza dalla fine del file parziale. Questo consente una randomizzazione parziale ma al contempo previene lunghi tempi di inizializzazione per grossi file vuoti.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;RetroShare sospenderà tutti i trasferimenti ed il salvataggio del file di configurazione qualora lo spazio libero sul disco dovesse scendere al di sotto di questo limite. Su alcuni sistemi, questo previene la perdita di informazioni. Una finestra di popup ti avviserà quando questo accade.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24114,17 +25183,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Questo valore controlla quante richieste di tunnel al secondo può inoltrare il tuo contatto.&lt;/p&gt;&lt;p&gt;Se disponi di una connessione Internet a banda larga, può portarlo su fino a 30-40, consentendo così il passaggio di tunnel statisticamente più lunghi. Fai molta attenzione però: questo genererà molti pacchetti piccoli che possono rallentare notevolmente il tuo trasferimento di file.&lt;/p&gt;&lt;p&gt;Il valore predefinito è 20. Nel dubbio, lascialo così.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Avvertimento</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24152,7 +25211,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Completato scaricamento</translation>
     </message>
@@ -24176,23 +25235,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Hai scaricato il %1 </translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Hai completato il %1 di scaricamento</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">completato %1 scaricamenti</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">completato %1 scaricamento</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Scaricamenti</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Caricamenti</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nome</translation>
@@ -24399,7 +25474,11 @@ p, li { white-space: pre-wrap; }
         <translation>Specifica...</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Trasferimento File&lt;/h1&gt; &lt;p&gt;RetroShare offre due modi per trasferie file: trasferimenti diretti dai tuoi amici, e trasferimenti a distanza anonimizzati con tunnel. Inoltre, il trasferimento file è multi-fonte e consente lo swarming (puoi essere una fonta mentre scarichi).&lt;/p&gt; &lt;p&gt;Puoi condividere file usando l’icona &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; bekka barra laterale sinistra. Queste file verranno elencati nella finestrella &quot;I Miei File&quot;. Per ciascun gruppo di amici, puoi stabilire se potranno vedere o meno questi file nella finestra &quot;File degli Amici&quot;.&lt;/p&gt; &lt;p&gt;La finestra di ricerca riporta i file nelle liste dei file dei tuoi amici, ed i file distanti che possono essere raggiunti anonimamente tramite il sistema di tunneling a multi-hop.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Sposta in coda...</translation>
     </message>
@@ -24424,7 +25503,7 @@ p, li { white-space: pre-wrap; }
         <translation>Scegli la cartella</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24445,7 +25524,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24478,17 +25557,7 @@ p, li { white-space: pre-wrap; }
         <translation>File %1 non completato. Se file multimediale, provane un anteprima.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Avvertimento</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Cambia il nome del file</translation>
     </message>
@@ -24503,7 +25572,7 @@ p, li { white-space: pre-wrap; }
         <translation>Per favore inserisci un nuovo--e valido--nome per il file</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Espandi tutto</translation>
@@ -24630,18 +25699,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Colonne</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Trasferimento file</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Tracciato</translation>
     </message>
@@ -24651,7 +25725,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visualizza colonna dei Percorsi</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>Impossibile eliminare il file anteprima</translation>
     </message>
@@ -24661,7 +25735,7 @@ p, li { white-space: pre-wrap; }
         <translation>Riprovare?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Crea Raccolta...</translation>
     </message>
@@ -24676,12 +25750,7 @@ p, li { white-space: pre-wrap; }
         <translation>Guarda Raccolta...</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+193"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Raccolta</translation>
     </message>
@@ -24691,7 +25760,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 tunnel</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Tunnel anonimo 0x</translation>
     </message>
@@ -24820,7 +25889,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-190"/>
         <location line="+19"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished">Contatto sconosciuto</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -24912,6 +25981,10 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">Tunnel anonimi</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25105,17 +26178,12 @@ p, li { white-space: pre-wrap; }
         <translation>Modulo</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Abilita l’Interfaccia Web di RetroShare</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Stato:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Parametri web</translation>
     </message>
@@ -25149,33 +26217,27 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port:</source>
+        <translation type="vanished">Porta:</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Interfaccia Web&lt;/h1&gt;&lt;p&gt;L’Interfaccia Web ti consente di controllare RetroShare tramite browser. Più dispositivi possono condividere il controllo di un’istanza di RetroShare. Quindi, potresti avviare una conversazione su un tablet, per poi proseguirla su un PC da tavolo.&lt;/p&gt; &lt;p&gt;Attenzione: non esporre l’Interfaccia Web all’Internet, dato che non dispone di alcun sistema di controllo dell’accesso, né di cifratura. Se vuoi usare l’Interfaccia Web tramite Internet, usa un tunnel SSH o un proxy verso una connessione sicura.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>Interfaccia Web non abilitata</translation>
     </message>
@@ -25185,12 +26247,12 @@ p, li { white-space: pre-wrap; }
         <translation>L’Interfaccia Web non è abilitata. Attivala in Impostazioni -&gt; Interfaccia Web</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>Non so riuscito ad avviare l’Interfaccia Web</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Interfaccia Web</translation>
     </message>
@@ -25327,7 +26389,11 @@ p, li { white-space: pre-wrap; }
         <translation>Pagine wiki</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Nuovo gruppo</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Nome della Pagina</translation>
     </message>
@@ -25342,7 +26408,7 @@ p, li { white-space: pre-wrap; }
         <translation>Id originale</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25430,7 +26496,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Storico modifiche pagina</translation>
     </message>
@@ -25465,7 +26531,7 @@ p, li { white-space: pre-wrap; }
         <translation>Id pagina</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25495,18 +26561,14 @@ p, li { white-space: pre-wrap; }
         <translation>Etichette</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Storico</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Visualizza storico modifiche</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -25527,7 +26589,7 @@ p, li { white-space: pre-wrap; }
         <translation>Rimposta</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Invia</translation>
     </message>
@@ -25599,6 +26661,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">Lasso di tempo</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25610,7 +26676,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Aggiornamento</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25625,7 +26700,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Altri</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25645,7 +26720,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25675,17 +26750,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Mese scorso</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">La settimana scorsa</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Oggi</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nuovo</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">Da</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">fino al</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Ricerca/filtro</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Livello di rete</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Gestire gli account</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Mostrando:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Te stesso</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Amici</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Seguendo</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Personalizzato</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Conto 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Conto 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Conto 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">Casella da baffare</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Posta segnale sil filo</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25748,42 +26891,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Rimuovi</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Località:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25828,41 +26964,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/D</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Seguendo</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Scononsciuto</translation>
@@ -25940,7 +27046,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2d</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -25973,11 +27079,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Immagini (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_ja_JP.ts b/retroshare-gui/src/lang/retroshare_ja_JP.ts
index 5f2256dd5..ce4e63aeb 100644
--- a/retroshare-gui/src/lang/retroshare_ja_JP.ts
+++ b/retroshare-gui/src/lang/retroshare_ja_JP.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">コメントを追加</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: 高度な検索</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>検索基準</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>さらに検索基準を追加</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>検索基準をリセット</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>検索をキャンセル</translation>
     </message>
@@ -157,6 +164,121 @@
         <translation>検索</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">アルバムを作成</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">アルバム名:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">カテゴリー</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">動物</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">家庭</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">友達</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">花</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">旅行</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">風景</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished"> ペット</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">肖像画</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">トラベル</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">仕事</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">ランダム</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">キャプション</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">位置:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">写真家:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">説明：</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">共有のオプション</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">ポリシー：</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">画質：</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">コメント:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">パブリック</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">イメージのサイズを変更 (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">イメージのサイズを変更 (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">戻る</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">写真を追加</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">いつ撮りましたか？</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -185,6 +307,22 @@
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">位置:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">説明：</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">共有のオプション</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">コメント</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -541,7 +679,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -567,23 +705,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -626,7 +751,7 @@ p, li { white-space: pre-wrap; }
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -713,10 +838,22 @@ p, li { white-space: pre-wrap; }
         <translation>リセット</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">受信速度</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">送信速度</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>常に手前に表示</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">スタイル</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -732,11 +869,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% 不透明</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">保存</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">キャンセル</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>開始:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">設定を非表示</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -809,7 +958,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">コメント</translation>
     </message>
@@ -839,12 +988,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -852,7 +1001,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -872,7 +1021,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -910,7 +1059,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -930,7 +1079,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -960,7 +1109,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">未読/既読の切り替え</translation>
     </message>
@@ -970,7 +1119,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">新規</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
@@ -978,12 +1127,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1003,18 +1152,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">展開</translation>
     </message>
@@ -1029,12 +1178,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">アイテムを削除</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1203,17 +1352,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
@@ -1223,17 +1372,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1241,7 +1380,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1264,7 +1403,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1289,18 +1428,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">展開</translation>
     </message>
@@ -1315,7 +1454,7 @@ into the image, so as to
         <translation type="unfinished">アイテムを削除</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
@@ -1325,7 +1464,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">コメント</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">非表示</translation>
     </message>
@@ -1333,7 +1482,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
@@ -1524,7 +1673,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>チャットロビーを表示</translation>
     </message>
@@ -1557,14 +1706,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1572,13 +1720,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>カウント</translation>
     </message>
@@ -1588,7 +1736,29 @@ into the image, so as to
         <translation>話題</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>プライベートチャット</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>公開チャット</translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1598,7 +1768,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1655,12 +1825,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1670,42 +1840,27 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">チャットロビーを作成</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[話題はありません]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation>プライベート</translation>
     </message>
     <message>
-        <location line="-770"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-557"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>パブリック</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1715,25 +1870,38 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">はい</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">いいえ</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1745,47 +1913,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>話題:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>ラベル</translation>
     </message>
@@ -1800,7 +1968,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
@@ -1820,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>アイテムを削除</translation>
     </message>
@@ -1865,7 +2033,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
@@ -1880,7 +2048,15 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Chat Settings</source>
+        <translation type="vanished">チャット設定</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">グループチャットで顔文字を有効にする</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1900,7 +2076,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1925,7 +2101,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1934,6 +2110,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">プライベートチャット</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1955,7 +2135,11 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">チャットフォント</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>チャットフォントを変更</translation>
     </message>
@@ -1965,10 +2149,14 @@ Double click a chat room to enter and chat.</source>
         <translation>チャットフォント:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>履歴</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">スタイル</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1983,13 +2171,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">グループチャット</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>プライベートチャット</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2059,22 +2251,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">検索</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2084,17 +2266,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2141,7 +2313,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished">説明</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2191,7 +2363,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>大文字・小文字を区別</translation>
     </message>
@@ -2297,7 +2469,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>チャットを表示</translation>
     </message>
@@ -2333,7 +2505,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
@@ -2368,12 +2540,12 @@ Double click a chat room to enter and chat.</source>
         <translation>斜体</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2453,6 +2625,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2490,7 +2667,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>書き込み中...</translation>
     </message>
@@ -2512,7 +2689,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>本当に履歴を削除しますか？</translation>
     </message>
@@ -2562,7 +2739,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2584,7 +2761,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2599,12 +2776,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,12 +2797,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2636,12 +2813,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2661,7 +2838,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2687,7 +2864,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2709,7 +2886,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2735,7 +2912,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>友達</translation>
     </message>
@@ -2795,7 +2972,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2811,7 +2988,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2863,45 +3040,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>エラー: ピア詳細を取得できません.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2911,7 +3088,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2993,17 +3170,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3023,7 +3195,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3045,6 +3217,10 @@ Double click on it to add his name on text writer.</source>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">ブラウズ</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
@@ -3091,7 +3267,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Eメール</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3107,12 +3283,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
@@ -3122,17 +3298,17 @@ Double click on it to add his name on text writer.</source>
         <translation>場所:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3142,7 +3318,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3167,22 +3343,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3202,27 +3368,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3268,17 +3439,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>証明書の読み込みに失敗</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3298,12 +3469,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3311,7 +3482,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3351,7 +3522,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3376,7 +3547,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3386,7 +3557,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Save as...</source>
+        <translation type="vanished">名前を付けて保存</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3425,7 +3600,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3435,7 +3610,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3460,7 +3635,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3473,7 +3648,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3508,7 +3683,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3518,7 +3693,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3583,7 +3763,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3611,7 +3791,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3621,20 +3801,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3644,14 +3821,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3661,8 +3836,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3687,7 +3861,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3979,7 +4153,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3987,8 +4161,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3998,7 +4171,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4034,12 +4207,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4059,7 +4232,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4079,18 +4252,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4105,7 +4278,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">タイプ</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">名前:</translation>
     </message>
@@ -4145,19 +4326,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4167,24 +4348,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>追加</translation>
     </message>
@@ -4194,7 +4363,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>検索</translation>
@@ -4247,13 +4416,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">作成</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4272,7 +4441,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4307,7 +4476,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4317,7 +4486,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4377,6 +4546,10 @@ p, li { white-space: pre-wrap; }
         <source>Add Channel Thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">件名:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4462,17 +4635,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4497,12 +4670,7 @@ p, li { white-space: pre-wrap; }
         <translation>件名を追加してください</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4517,12 +4685,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">非表示</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4556,7 +4730,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,6 +4739,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">件名</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4585,8 +4763,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4605,7 +4783,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4635,17 +4813,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">タイトル</translation>
     </message>
@@ -4698,7 +4876,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">画像ファイルを開く</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4708,8 +4886,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4718,6 +4896,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">送信</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4732,7 +4914,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4767,7 +4949,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">作成</translation>
     </message>
@@ -4777,7 +4959,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4792,7 +4974,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4813,7 +4995,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4821,17 +5003,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>場所:</translation>
     </message>
@@ -4841,12 +5023,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4866,7 +5048,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4876,7 +5063,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4886,12 +5073,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4901,7 +5093,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4971,33 +5163,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>ラベル</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5087,7 +5279,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5755,7 +5947,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5763,38 +5955,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5802,12 +5994,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5969,7 +6161,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5979,7 +6171,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6039,21 +6231,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6175,7 +6357,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6217,7 +6399,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6253,7 +6435,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>検索</translation>
@@ -6269,7 +6451,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6506,7 +6688,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6544,7 +6726,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6555,132 +6737,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">名前</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">状態</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6763,38 +6829,33 @@ Also check your ports!</source>
         <translation>フォントをデフォルトに戻す</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6812,17 +6873,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>すべてのフィールドは最低3文字以上必要です</translation>
     </message>
@@ -6832,12 +6883,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>ポート</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6858,38 +6914,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6909,12 +6965,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6924,43 +6980,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7004,13 +7055,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7020,7 +7071,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7055,7 +7106,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7065,7 +7116,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7075,7 +7131,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7301,13 +7362,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7317,57 +7392,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7375,45 +7432,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7438,7 +7499,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7488,12 +7549,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7617,7 +7678,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7625,7 +7686,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7795,7 +7856,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>タイトル</translation>
     </message>
@@ -7808,12 +7869,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7838,7 +7899,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7853,14 +7914,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">最新の投稿</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
@@ -7871,13 +7932,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">人気度</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="obsolete">表示</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7890,7 +7955,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8026,7 +8091,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8037,22 +8102,22 @@ p, li { white-space: pre-wrap; }
         <translation>チャンネルを作成</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>自動ダウンロード有効</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>購読済みのチャンネル</translation>
     </message>
@@ -8072,12 +8137,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>自動ダウンロード無効</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8112,22 +8177,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">再生</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8147,17 +8212,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8167,10 +8232,25 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">フォーム</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">タイトル</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">状態</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8208,19 +8288,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">ラベル</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>チャンネルを購読</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8234,7 +8304,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -8249,7 +8319,7 @@ p, li { white-space: pre-wrap; }
         <translation>チャンネルの説明</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>ロード中</translation>
     </message>
@@ -8264,9 +8334,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
+        <source>New Channel</source>
+        <translation type="vanished">新規チャンネル</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8277,7 +8346,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8298,7 +8367,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>再生</translation>
     </message>
@@ -8360,18 +8429,18 @@ p, li { white-space: pre-wrap; }
         <translation>非表示</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>新規</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>コメント</translation>
     </message>
@@ -8386,17 +8455,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">ロード中</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8421,16 +8494,51 @@ p, li { white-space: pre-wrap; }
         <translation>メディアを再生</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">チャンネルに投稿</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">ロード中</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">タイトル</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">チャンネルが選択されていません。</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">自動ダウンロード無効</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">自動ダウンロード有効</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">ファイル</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">説明</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">チャンネルに投稿</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8500,7 +8608,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8536,7 +8644,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">コメント</translation>
     </message>
@@ -8551,13 +8659,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8572,7 +8680,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8587,7 +8695,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8647,22 +8755,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8737,13 +8835,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8794,17 +8891,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8919,7 +9016,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8932,7 +9029,7 @@ p, li { white-space: pre-wrap; }
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8962,7 +9059,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>コメント</translation>
@@ -9001,7 +9098,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9025,21 +9122,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9049,7 +9131,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9078,7 +9160,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9109,7 +9191,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9160,7 +9242,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9176,7 +9258,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -9196,9 +9278,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">ラベル</translation>
+        <source>Loading</source>
+        <translation type="vanished">ロード中</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9229,13 +9310,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9246,7 +9327,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -9266,17 +9347,21 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">ロード中</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
@@ -9289,66 +9374,63 @@ before you can comment</source>
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">最新の投稿</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>タイトル</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>期日</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>ロード中</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9358,7 +9440,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9398,23 +9485,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9457,12 +9544,16 @@ before you can comment</source>
         <translation>RetroShareリンクをコピー</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">展開</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9492,8 +9583,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9576,12 +9667,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9642,7 +9733,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9662,7 +9753,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9714,7 +9805,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9724,7 +9815,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9739,7 +9830,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9805,12 +9896,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9841,16 +9932,23 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">ロード中</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9861,12 +9959,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9874,7 +9972,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>パブリック</translation>
     </message>
@@ -9934,7 +10032,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>コメント:</translation>
     </message>
@@ -9957,7 +10055,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9973,12 +10071,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9995,23 +10093,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10027,28 +10125,22 @@ This message is missing. You should receive it later.</source>
         <translation>名前を追加してください</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>所有者:</translation>
     </message>
@@ -10058,12 +10150,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>情報</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10073,7 +10165,7 @@ This message is missing. You should receive it later.</source>
         <translation>最新の投稿</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10148,12 +10240,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>人気度</translation>
     </message>
@@ -10169,22 +10256,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">作成</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10192,7 +10284,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>ロード中</translation>
     </message>
@@ -10252,7 +10344,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10309,12 +10401,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShareリンクをコピー</translation>
     </message>
@@ -10337,7 +10429,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10350,14 +10442,18 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">ロード中</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10367,7 +10463,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10377,12 +10473,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10402,14 +10493,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10421,7 +10504,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10469,13 +10552,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">ロード中</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10856,7 +10943,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10872,7 +10959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10891,7 +10978,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10965,7 +11052,7 @@ p, li { white-space: pre-wrap; }
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10975,7 +11062,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11003,7 +11090,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11013,7 +11100,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11023,7 +11110,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11043,37 +11130,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11085,12 +11148,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11105,7 +11168,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished">名前を付けて保存</translation>
     </message>
@@ -11370,14 +11438,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11387,12 +11455,12 @@ p, li { white-space: pre-wrap; }
         <translation>検索</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11402,7 +11470,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11417,27 +11485,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished">閉じる</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11453,39 +11521,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11505,20 +11563,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11528,78 +11584,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11610,17 +11666,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11635,24 +11691,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11667,12 +11723,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11682,7 +11733,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11757,7 +11808,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11787,7 +11838,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11802,7 +11853,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11850,7 +11901,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11858,7 +11909,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11901,7 +11952,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11981,7 +12032,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11997,12 +12048,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12107,7 +12163,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12157,21 +12213,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12181,7 +12237,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12196,7 +12252,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12211,12 +12267,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12236,12 +12292,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12251,7 +12307,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12259,7 +12315,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12289,13 +12345,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12309,7 +12359,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12319,12 +12369,7 @@ These identities will soon be not supported anymore.</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12335,27 +12380,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12375,7 +12420,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12385,18 +12430,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12406,7 +12445,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12416,7 +12460,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12426,15 +12470,10 @@ These identities will soon be not supported anymore.</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">削除</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12460,7 +12499,7 @@ These identities will soon be not supported anymore.</source>
         <translation>追加</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">作成</translation>
     </message>
@@ -12470,13 +12509,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12486,7 +12525,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12560,7 +12599,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12570,12 +12609,12 @@ These identities will soon be not supported anymore.</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12594,38 +12633,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">送信</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12643,32 +12670,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">状態:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12689,12 +12711,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12703,31 +12720,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12737,7 +12749,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12765,7 +12777,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12781,8 +12793,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12803,7 +12814,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>終了</translation>
     </message>
@@ -12814,12 +12825,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12844,12 +12855,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>状態</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12860,35 +12870,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>ヘルプ</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12903,12 +12909,7 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12938,7 +12939,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12958,7 +12959,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13003,13 +13004,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13024,7 +13024,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13033,17 +13033,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13079,12 +13079,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13099,32 +13099,32 @@ These identities will soon be not supported anymore.</source>
         <translation>太字</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>斜体</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>下線</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13135,32 +13135,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13230,7 +13230,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13270,7 +13270,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13290,18 +13290,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13312,17 +13312,7 @@ Do you want to save message to draft box?</source>
         <translation>RetroShareリンクを貼り付け</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13342,7 +13332,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13352,21 +13342,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13381,7 +13371,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13391,30 +13381,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13529,13 +13519,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished">詳細</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>ファイルを開く...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13555,7 +13545,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13576,7 +13566,7 @@ Do you want to save message ?</source>
         <translation>さらにファイルを追加</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13606,18 +13596,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13657,13 +13647,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13673,12 +13663,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13756,7 +13746,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13766,7 +13756,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13789,7 +13779,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13797,7 +13787,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13825,7 +13815,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13835,37 +13825,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13905,7 +13895,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13957,7 +13947,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13967,12 +13957,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13982,22 +13972,17 @@ Do you want to save message ?</source>
         <translation>ダウンロード</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14006,24 +13991,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14038,12 +14013,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14065,6 +14040,10 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">進む</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14143,7 +14122,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14153,16 +14132,24 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Print</source>
+        <translation type="vanished">印刷</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">表示</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14192,17 +14179,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14233,7 +14220,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>件名</translation>
     </message>
@@ -14243,7 +14230,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>期日</translation>
     </message>
@@ -14253,7 +14240,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14262,16 +14249,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14298,12 +14275,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14379,7 +14356,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14393,7 +14370,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14408,28 +14385,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14464,17 +14431,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14528,7 +14485,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -14538,7 +14495,7 @@ Do you want to save message ?</source>
         <translation>アイテムを削除</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14573,7 +14530,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
@@ -14714,7 +14671,7 @@ Do you want to save message ?</source>
         <translation>ピア ID</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14724,7 +14681,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14738,13 +14695,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14777,13 +14728,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14793,12 +14749,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14831,7 +14787,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14852,7 +14808,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14882,19 +14838,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">検索</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14904,12 +14860,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14919,7 +14875,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15034,7 +14990,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15044,7 +15000,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15151,7 +15107,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15166,7 +15122,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15176,12 +15132,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15419,7 +15375,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15439,12 +15395,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15459,7 +15415,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15470,19 +15426,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15490,7 +15444,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15629,12 +15583,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15679,7 +15628,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15725,21 +15679,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>エラー: ピア詳細を取得できません.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15757,7 +15711,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15826,6 +15780,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">おそらくパスワードが間違っています</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15833,12 +15791,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15864,7 +15822,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>チャット</translation>
     </message>
@@ -15885,7 +15843,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>アイテムを削除</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>名前:</translation>
     </message>
@@ -15925,7 +15883,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>メッセージを作成</translation>
     </message>
@@ -15983,7 +15941,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>非表示</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16150,6 +16108,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">フォーム</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16162,6 +16127,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>TextLabel</source>
         <translation>ラベル</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">コメント</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16222,6 +16191,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">コメントを追加</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16301,17 +16274,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16340,7 +16313,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16399,19 +16372,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16447,12 +16420,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>ラベル</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16594,6 +16567,10 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">&lt;無効&gt;</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16663,27 +16640,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16736,7 +16698,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">新規</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16756,8 +16718,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">コメント</translation>
     </message>
@@ -16782,13 +16744,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">コメント</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16816,12 +16778,16 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Notes</source>
+        <translation type="vanished">メモ</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16836,22 +16802,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">画像ファイルを開く</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16867,17 +16823,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16887,7 +16833,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit</source>
+        <translation type="vanished">投稿</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>タイトルを追加してください</translation>
     </message>
@@ -16907,22 +16857,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16937,7 +16877,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16948,7 +16888,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16958,7 +16898,7 @@ p, li { white-space: pre-wrap; }
         <translation>タイトル</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>リンク</translation>
     </message>
@@ -16966,12 +16906,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17005,7 +16945,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17043,17 +16983,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">ラベル</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17069,7 +16999,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -17084,17 +17014,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Loading</source>
+        <translation type="vanished">ロード中</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17107,18 +17036,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>コメント</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
@@ -17129,12 +17058,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>コメント</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17144,7 +17073,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17154,17 +17083,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">非表示</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17174,7 +17103,7 @@ p, li { white-space: pre-wrap; }
         <translation>新規</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17184,7 +17113,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
@@ -17225,11 +17154,50 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>ロード中</translation>
     </message>
 </context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">フォーム</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">新規</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">今日</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">昨日</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">今週</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">今月</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">今年</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
+</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17248,17 +17216,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17268,15 +17226,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17286,42 +17244,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished">ラベル</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17341,7 +17299,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">検索</translation>
     </message>
@@ -17371,17 +17329,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17396,17 +17354,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">RetroShareリンクをコピー</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17416,31 +17369,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17455,7 +17404,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">購読</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17529,16 +17478,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">チャンネルが選択されていません。</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17628,16 +17567,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17745,7 +17684,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17761,7 +17700,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17796,12 +17735,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17845,27 +17784,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17875,12 +17814,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17910,13 +17849,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17928,22 +17867,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17958,7 +17887,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17973,24 +17902,30 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">画像ファイルを開く</translation>
+        <source>Date</source>
+        <translation type="vanished">期日</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18001,7 +17936,7 @@ and use the import button to load it</source>
         <translation type="unfinished">フォーム</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18020,7 +17955,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18030,7 +17965,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18057,7 +17992,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18067,7 +18002,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18087,7 +18022,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18203,7 +18138,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18211,42 +18146,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18278,7 +18208,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18286,8 +18216,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18555,12 +18485,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18591,7 +18521,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18625,7 +18555,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18644,26 +18574,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18743,7 +18653,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18753,7 +18663,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18763,7 +18673,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18779,7 +18689,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18846,7 +18756,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18874,7 +18784,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19054,29 +18964,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">名前</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">状態</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19319,18 +19213,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19470,7 +19352,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19637,7 +19519,7 @@ p, li { white-space: pre-wrap; }
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19650,7 +19532,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19823,22 +19705,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19846,12 +19718,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20539,7 +20411,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">名前</translation>
@@ -20660,7 +20532,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">名前</translation>
     </message>
@@ -20680,7 +20552,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20736,7 +20608,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20750,6 +20622,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20763,11 +20640,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20790,17 +20662,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20824,9 +20691,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20847,7 +20712,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>保存された Retoroshare の設定をすべてリセット.</translation>
     </message>
@@ -20908,7 +20773,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Retoroshare の言語を設定.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>ログファイル &apos;%1&quot; が開けません: %2</translation>
     </message>
@@ -20929,7 +20794,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20959,7 +20824,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20977,7 +20842,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20994,12 +20859,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21060,7 +20925,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21075,7 +20940,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21175,23 +21040,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>ダウンロード</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShareリンクをコピー</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21201,7 +21066,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>ダウンロード</translation>
     </message>
@@ -21238,7 +21103,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -21249,17 +21114,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21279,7 +21144,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21287,7 +21152,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21303,22 +21168,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>アイテムを削除</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>場所:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21335,7 +21200,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>非表示</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21360,8 +21225,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21369,7 +21234,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21400,7 +21265,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -21445,12 +21310,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>状態:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>メッセージを作成</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21470,12 +21335,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21485,17 +21355,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>非表示</translation>
     </message>
@@ -21505,7 +21365,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21515,12 +21375,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21579,12 +21439,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>ローカル アドレス</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21605,22 +21465,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21633,16 +21493,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21652,46 +21517,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21701,7 +21543,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21726,95 +21568,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21829,7 +21613,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21839,7 +21687,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21851,12 +21714,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21866,7 +21729,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21881,23 +21744,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21908,7 +21771,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21918,7 +21791,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21928,7 +21806,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21968,7 +21856,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21983,7 +21871,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">受信</translation>
     </message>
@@ -22019,32 +21912,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22099,7 +21967,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22124,7 +21992,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22136,7 +22004,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22159,7 +22027,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>状態</translation>
     </message>
@@ -22219,28 +22087,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22256,18 +22113,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22302,12 +22159,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22330,22 +22187,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22380,7 +22237,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22390,12 +22247,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22475,7 +22332,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22485,12 +22342,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22509,7 +22366,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22529,17 +22386,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22549,7 +22406,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22640,7 +22497,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22648,7 +22505,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>ファイル</translation>
     </message>
@@ -22699,16 +22556,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22718,7 +22570,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>ダウンロード</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22733,7 +22585,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22749,7 +22601,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22774,7 +22626,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22917,12 +22769,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22946,7 +22798,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>ログイン</translation>
     </message>
@@ -23285,7 +23137,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23522,7 +23374,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23558,15 +23410,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23576,13 +23425,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23592,57 +23446,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23650,7 +23459,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23660,7 +23469,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23671,12 +23480,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23704,7 +23512,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23715,7 +23523,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23725,27 +23533,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23830,7 +23633,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23839,12 +23642,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23869,12 +23667,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23939,7 +23732,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23949,17 +23747,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23987,7 +23775,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24015,19 +23803,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>名前</translation>
@@ -24234,12 +24022,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24264,7 +24047,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24285,7 +24068,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24318,17 +24101,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24343,7 +24116,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24470,18 +24243,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24491,7 +24269,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24501,7 +24279,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24516,7 +24294,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24526,7 +24304,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24940,17 +24718,12 @@ p, li { white-space: pre-wrap; }
         <translation>フォーム</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">状態:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24990,27 +24763,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25020,12 +24783,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25162,7 +24925,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25177,7 +24940,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25265,7 +25028,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25300,7 +25063,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25330,18 +25093,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">履歴</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>状態</translation>
     </message>
@@ -25362,7 +25121,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>投稿</translation>
     </message>
@@ -25445,7 +25204,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25460,7 +25228,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25480,7 +25248,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25510,17 +25278,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Today</source>
+        <translation type="vanished">今日</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">新規</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">友達</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25583,42 +25363,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">フォーム</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">削除</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">場所:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25663,41 +25436,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25775,7 +25518,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25812,7 +25555,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_ko.ts b/retroshare-gui/src/lang/retroshare_ko.ts
index 927baa9e7..d3aa306a1 100644
--- a/retroshare-gui/src/lang/retroshare_ko.ts
+++ b/retroshare-gui/src/lang/retroshare_ko.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">설명 추가</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>레트로 쉐어: 고급 검색</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>검색 문구</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>검색 문구 더 추가합니다.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>검색 문구를 초기화합니다.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>검색을 취소합니다.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>검색</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">앨범 만들기</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">앨범 이름:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">분류:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">동물</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">가족</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">친구</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">화훼</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">휴일</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">수평 사진</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">반려동물</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">수직 사진</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">여행</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">작업</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">임의</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">자막설명:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">장소:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">사진가:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">설명:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">공유 옵션</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">정책:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">화질:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">설명:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">식별:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">공용</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">제한</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">그림 크기 조절(&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">그림 크기 조절(&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">원본 그림 보내기</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">설명을 추가할 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">인증한 설명</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">어떤 설명이든 추가할 수 있음</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">신원 정보와 함께 게시</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; 그림을 추가하려면 끌어다놓으십시오. 하단 세부 정보를 편집하려면 그림을 누르십시오.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">뒤로</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">사진 추가</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">앨범 게시</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">제목 없는 앨범</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">이 앨범의 설명을 적으세요...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">어디서 찍었을까요?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">앨범 미리 보기 그림 불러오기</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>앨범</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">앨범 미리 보기 그림</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">요약</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,30 @@
         <source>Caption</source>
         <translation>자막 설명</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">장소:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">일시</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">설명:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">공유 옵션</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">설명</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">게시 신원</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -545,7 +755,7 @@ p, li { white-space: pre-wrap; }
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -571,23 +781,10 @@ p, li { white-space: pre-wrap; }
         <translation>사진</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%pKb</translation>
     </message>
@@ -624,13 +821,17 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">아바타 추가</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>아바타 사진 설정</translation>
     </message>
@@ -649,6 +850,10 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">아바타 불러오기</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -717,10 +922,22 @@ p, li { white-space: pre-wrap; }
         <translation>초기화</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">수신율</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">송신율</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>항상 위로</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">스타일</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -736,11 +953,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% 투명도</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">저장</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">취소</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>시초:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">설정 숨기기</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -813,7 +1042,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">답글 달기</translation>
     </message>
@@ -843,12 +1072,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -856,7 +1085,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -876,7 +1105,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -914,7 +1143,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -934,7 +1163,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -964,7 +1193,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -974,7 +1203,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
@@ -982,12 +1211,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1007,18 +1236,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">확장</translation>
     </message>
@@ -1033,12 +1262,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">항목 제거</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1207,17 +1436,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
@@ -1227,17 +1456,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1245,7 +1464,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1268,7 +1487,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1293,18 +1512,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">확장</translation>
     </message>
@@ -1319,7 +1538,7 @@ into the image, so as to
         <translation type="unfinished">항목 제거</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -1329,7 +1548,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">답글 달기</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">숨김</translation>
     </message>
@@ -1337,7 +1566,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -1528,7 +1757,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>대화 대기방 보이기</translation>
     </message>
@@ -1561,14 +1790,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1576,13 +1804,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>계수</translation>
     </message>
@@ -1592,7 +1820,29 @@ into the image, so as to
         <translation>주제</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1602,7 +1852,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1659,12 +1909,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1674,42 +1924,27 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">대화 대기방 만들기</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[설정한 주제가 없습니다]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation>개인용</translation>
     </message>
     <message>
-        <location line="-770"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-557"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>공용</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1719,22 +1954,27 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1749,47 +1989,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>유형:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
@@ -1804,7 +2044,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">표시</translation>
@@ -1824,7 +2064,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>항목 제거</translation>
     </message>
@@ -1869,7 +2109,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
@@ -1884,7 +2124,15 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Chat Settings</source>
+        <translation type="vanished">대화 설정</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">이모티콘 집단 대화 활성화</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1904,7 +2152,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1929,7 +2177,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1938,6 +2186,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">개인 대화</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1959,7 +2211,11 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">대화 글꼴</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>대화 글꼴 바꾸기</translation>
     </message>
@@ -1969,10 +2225,14 @@ Double click a chat room to enter and chat.</source>
         <translation>대화 글꼴:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>기록</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">스타일</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1987,13 +2247,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">집단 대화</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>개인 대화</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2063,22 +2327,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">검색</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2088,17 +2342,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2195,7 +2439,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>대소문자 구분</translation>
     </message>
@@ -2301,7 +2545,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>대화 보이기</translation>
     </message>
@@ -2337,7 +2581,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>닫기</translation>
     </message>
@@ -2372,12 +2616,12 @@ Double click a chat room to enter and chat.</source>
         <translation>기울임</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2457,6 +2701,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2494,7 +2743,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>입력중 ...</translation>
     </message>
@@ -2516,7 +2765,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>실제 기록을 정말로 삭제하시겠습니까?</translation>
     </message>
@@ -2566,7 +2815,7 @@ after HTML conversion.</source>
         <translation>다른 용무중이며 응답하지 않을 수도 있습니다</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2588,7 +2837,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2603,12 +2852,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2624,12 +2873,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2640,12 +2889,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2665,7 +2914,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2691,7 +2940,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2713,7 +2962,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2739,7 +2988,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>친구</translation>
     </message>
@@ -2799,7 +3048,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2815,7 +3064,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2867,45 +3116,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>오류 : 동료 세부 정보를 가져올 수 없습니다</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2915,7 +3164,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2997,17 +3246,12 @@ Double click on it to add his name on text writer.</source>
         <translation>없음</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3027,7 +3271,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3044,6 +3288,10 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>친구 연결 마법사</translation>
     </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">서명 포함</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
@@ -3054,6 +3302,10 @@ Double click on it to add his name on text writer.</source>
         <source>RetroShare ID</source>
         <translation>레트로 쉐어 ID</translation>
     </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">친구 레트로 쉐어 ID 추가...</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3095,7 +3347,11 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">이메일</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Subject:</source>
+        <translation type="vanished">제목:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3111,12 +3367,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>이름:</translation>
     </message>
@@ -3126,17 +3382,17 @@ Double click on it to add his name on text writer.</source>
         <translation>지역:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>옵션</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3146,7 +3402,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3171,22 +3427,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3206,27 +3452,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3272,17 +3523,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>서명 불러오기에 실패했습니다</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>레트로 쉐어 초대</translation>
     </message>
@@ -3302,12 +3553,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3315,7 +3566,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3355,7 +3606,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3380,7 +3631,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3390,7 +3641,15 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">레트로 쉐어 초대</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">다른 이름으로 저장...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3429,7 +3688,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3439,7 +3698,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3464,7 +3723,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3477,7 +3736,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3512,7 +3771,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3522,7 +3781,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3587,7 +3851,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3615,7 +3879,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3625,20 +3889,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3648,14 +3909,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3665,8 +3924,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3691,7 +3949,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3983,7 +4241,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3991,8 +4249,7 @@ p, li { white-space: pre-wrap; }
         <translation>없음</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4002,7 +4259,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4038,12 +4295,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4063,7 +4320,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4083,18 +4340,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4109,7 +4366,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">형식</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">이름:</translation>
     </message>
@@ -4149,19 +4414,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4171,24 +4436,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>추가</translation>
     </message>
@@ -4198,7 +4451,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>검색</translation>
@@ -4251,13 +4504,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">만들기</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4276,7 +4529,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4311,7 +4564,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4321,7 +4574,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4381,6 +4634,10 @@ p, li { white-space: pre-wrap; }
         <source>Add Channel Thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">제목 :</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4466,17 +4723,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4501,12 +4758,7 @@ p, li { white-space: pre-wrap; }
         <translation>제목을 입력해주십시오</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4521,12 +4773,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">숨김</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4560,7 +4818,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4569,6 +4827,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>포럼</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">제목</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4589,8 +4851,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4609,7 +4871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4639,17 +4901,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">제목</translation>
     </message>
@@ -4702,7 +4964,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">그림 파일 불러오기</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4712,8 +4974,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4722,6 +4984,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">보내기</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4736,7 +5002,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4771,7 +5037,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">만들기</translation>
     </message>
@@ -4781,7 +5047,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4796,7 +5062,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4817,7 +5083,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4825,17 +5091,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>이름:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>지역:</translation>
     </message>
@@ -4845,12 +5111,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4870,7 +5136,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4880,7 +5151,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4890,12 +5161,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>인증</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4905,7 +5181,7 @@ Do you want to discard this message?</source>
         <translation>서명 포함</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4975,33 +5251,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5091,7 +5367,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5759,7 +6035,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5767,38 +6043,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5806,12 +6082,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5973,7 +6249,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5983,7 +6259,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6043,21 +6319,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6179,7 +6445,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6221,7 +6487,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6257,7 +6523,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished">검색</translation>
@@ -6273,7 +6539,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6510,7 +6776,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6548,7 +6814,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6559,132 +6825,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">이름</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">상태</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6767,38 +6917,33 @@ Also check your ports!</source>
         <translation>글꼴을 기본으로 재설정</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6816,17 +6961,7 @@ Also check your ports!</source>
         <translation>암호</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>모든 분야의 3 문자의 최소 필요합니다</translation>
     </message>
@@ -6836,12 +6971,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>포트</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6862,38 +7002,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6913,12 +7053,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6928,43 +7068,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7008,13 +7143,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7024,7 +7159,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7059,7 +7194,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7069,7 +7204,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7079,7 +7219,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7305,13 +7450,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>레트로 쉐어에 친구 추가하기</translation>
     </message>
@@ -7321,57 +7480,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7379,45 +7520,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7442,7 +7587,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>레트로 쉐어 초대</translation>
     </message>
@@ -7492,12 +7637,12 @@ p, li { white-space: pre-wrap; }
         <translation>레트로 쉐어 피드백</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>레트로 쉐어 지원</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7621,7 +7766,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7629,7 +7774,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7799,7 +7944,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>제목</translation>
     </message>
@@ -7812,12 +7957,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>설명</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7842,7 +7987,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7857,14 +8002,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">최신 게시글</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
@@ -7875,13 +8020,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">인기도</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="obsolete">표시</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7894,7 +8043,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8030,7 +8179,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8041,22 +8190,22 @@ p, li { white-space: pre-wrap; }
         <translation>채널 만들기</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>자동 다운로드 활성화</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>가입한 채널</translation>
     </message>
@@ -8076,12 +8225,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>자동 다운로드 비활성화</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8116,22 +8265,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8151,17 +8300,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8171,10 +8320,25 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">양식</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">제목</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">상태</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8212,19 +8376,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">텍스트 레이블</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>채널에 가입</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8238,7 +8392,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -8253,7 +8407,7 @@ p, li { white-space: pre-wrap; }
         <translation>채널 설명</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>불러오는 중</translation>
     </message>
@@ -8268,9 +8422,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
+        <source>New Channel</source>
+        <translation type="vanished">새 채널</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8281,7 +8434,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8302,7 +8455,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8364,18 +8517,18 @@ p, li { white-space: pre-wrap; }
         <translation>숨김</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>새 글</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>답글 달기</translation>
     </message>
@@ -8390,17 +8543,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">불러오는 중</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8425,16 +8582,55 @@ p, li { white-space: pre-wrap; }
         <translation>미디어 재생</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">채널에 게시하기</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">불러오는 중</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">제목</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">제목 검색</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">선택한 채널 없음</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">자동 다운로드 비활성화</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">자동 다운로드 활성화</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">피드</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">설명:</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">채널에 게시하기</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8504,7 +8700,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8540,7 +8736,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">설명</translation>
     </message>
@@ -8555,13 +8751,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">피드</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8576,7 +8772,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8591,7 +8787,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8651,22 +8847,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8741,13 +8927,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8798,17 +8983,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8923,7 +9108,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8936,7 +9121,7 @@ p, li { white-space: pre-wrap; }
         <translation>양식</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8966,7 +9151,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>답글 달기</translation>
@@ -9005,7 +9190,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9029,21 +9214,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9053,7 +9223,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9082,7 +9252,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9113,7 +9283,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9164,7 +9334,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9180,7 +9350,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -9200,9 +9370,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">텍스트 레이블</translation>
+        <source>Loading</source>
+        <translation type="vanished">불러오는 중</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9233,13 +9402,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>제목:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9250,7 +9419,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -9270,17 +9439,21 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">불러오는 중</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>숨김</translation>
     </message>
@@ -9293,66 +9466,63 @@ before you can comment</source>
         <translation>양식</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>포럼 검색</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">최신 게시글</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>제목</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>날짜</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>작성자</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>불러오는 중</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9362,7 +9532,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9402,23 +9577,23 @@ before you can comment</source>
         <translation>작성자 검색</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation>이름 없음</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9461,12 +9636,16 @@ before you can comment</source>
         <translation>레트로 쉐어 링크 복사</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>숨김</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">확장</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9496,8 +9675,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9511,6 +9690,10 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">없음</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9580,12 +9763,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">편집</translation>
     </message>
@@ -9646,7 +9829,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9666,7 +9849,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9718,7 +9901,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9728,7 +9911,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9743,7 +9926,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9809,12 +9992,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9845,16 +10028,23 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">불러오는 중</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9865,12 +10055,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>설명</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9878,7 +10068,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>공용</translation>
     </message>
@@ -9938,7 +10128,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished">설명:</translation>
     </message>
@@ -9961,7 +10151,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9977,12 +10167,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9999,23 +10189,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10031,28 +10221,22 @@ This message is missing. You should receive it later.</source>
         <translation>이름을 입력해주십시오</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10062,12 +10246,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>정보</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10077,7 +10261,7 @@ This message is missing. You should receive it later.</source>
         <translation>최신 게시글</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10152,12 +10336,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>인기도</translation>
     </message>
@@ -10173,22 +10352,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">만들기</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>작성자</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10196,7 +10380,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>불러오는 중</translation>
     </message>
@@ -10256,7 +10440,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10313,12 +10497,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>레트로 쉐어 링크 복사</translation>
     </message>
@@ -10341,7 +10525,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10354,14 +10538,18 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">불러오는 중</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10371,7 +10559,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10381,12 +10569,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10406,14 +10589,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10425,7 +10600,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10473,13 +10648,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">불러오는 중</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10860,7 +11039,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10876,7 +11055,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10895,7 +11074,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10969,7 +11148,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">양식</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10979,7 +11158,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11007,7 +11186,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11017,7 +11196,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11027,7 +11206,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11047,37 +11226,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11089,12 +11244,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11109,7 +11264,12 @@ new short format</source>
         <translation type="unfinished">레트로 쉐어 초대</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished">다른 이름으로 저장...</translation>
     </message>
@@ -11374,14 +11534,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>모두</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11391,12 +11551,12 @@ p, li { white-space: pre-wrap; }
         <translation>검색</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11406,7 +11566,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11421,27 +11581,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished">닫기</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11457,39 +11617,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11509,20 +11659,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11532,78 +11680,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>유형:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11614,17 +11762,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11639,24 +11787,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11671,12 +11819,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11686,7 +11829,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11761,7 +11904,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11791,7 +11934,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11806,7 +11949,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11854,7 +11997,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11862,7 +12005,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11905,7 +12048,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11985,7 +12128,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12001,12 +12144,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12111,7 +12259,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12161,21 +12309,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12185,7 +12333,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12200,7 +12348,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12215,12 +12363,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12240,12 +12388,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12255,7 +12403,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12263,7 +12411,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12293,13 +12441,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12313,7 +12455,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12323,12 +12465,7 @@ These identities will soon be not supported anymore.</source>
         <translation>없음</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12339,27 +12476,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12379,7 +12516,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12389,18 +12526,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12410,7 +12541,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12420,7 +12556,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12430,15 +12566,10 @@ These identities will soon be not supported anymore.</source>
         <translation>형식</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">제거</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12464,7 +12595,7 @@ These identities will soon be not supported anymore.</source>
         <translation>추가</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">만들기</translation>
     </message>
@@ -12474,13 +12605,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12490,7 +12621,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12564,7 +12695,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>복사하기</translation>
     </message>
@@ -12574,12 +12705,12 @@ These identities will soon be not supported anymore.</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12598,38 +12729,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">보내기</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12647,32 +12766,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">상태:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12693,12 +12807,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12707,31 +12816,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12741,7 +12845,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12769,7 +12873,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12785,8 +12889,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>옵션</translation>
     </message>
@@ -12807,7 +12910,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12818,12 +12921,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12852,12 +12955,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>상태</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12868,35 +12970,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>도움말</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12911,12 +13009,7 @@ These identities will soon be not supported anymore.</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12946,7 +13039,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>정말로 레트로 쉐어를 나가시겠습니까?</translation>
     </message>
@@ -12966,7 +13059,7 @@ These identities will soon be not supported anymore.</source>
         <translation>표시</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13011,13 +13104,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13032,7 +13124,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13041,17 +13133,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13087,12 +13179,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13107,32 +13199,32 @@ These identities will soon be not supported anymore.</source>
         <translation>굵게</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>기울임</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>밑줄</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>제목:</translation>
     </message>
@@ -13143,32 +13235,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13238,7 +13330,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13278,7 +13370,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13298,18 +13390,18 @@ These identities will soon be not supported anymore.</source>
         <translation>레트로 쉐어에서 여러분과 친구가 되고 싶어합니다.</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13320,17 +13412,7 @@ Do you want to save message to draft box?</source>
         <translation>레트로 쉐어 링크 붙여넣기</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13350,7 +13432,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13360,21 +13442,21 @@ Do you want to save message to draft box?</source>
         <translation>보낸이</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13389,7 +13471,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13399,30 +13481,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>레트로 쉐어</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>제목 없이 메시지를 보내시겠습니까?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>알 수 없음</translation>
     </message>
@@ -13537,13 +13619,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13563,7 +13645,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13584,7 +13666,7 @@ Do you want to save message ?</source>
         <translation>추가 파일 추가</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13614,18 +13696,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>닫기</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>어디에서 :</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13665,13 +13747,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13681,12 +13763,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13764,7 +13846,7 @@ Do you want to save message ?</source>
         <translation>기본값</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13774,7 +13856,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13797,7 +13879,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13805,7 +13887,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13833,7 +13915,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13843,37 +13925,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>제목:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>어디에서 :</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>어디로 :</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13913,7 +13995,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13965,7 +14047,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13975,12 +14057,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>제목 없음</translation>
     </message>
@@ -13990,22 +14072,17 @@ Do you want to save message ?</source>
         <translation>다운로드</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14014,24 +14091,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14046,12 +14113,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14073,6 +14140,10 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">삭제</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14151,7 +14222,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14161,16 +14232,24 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Delete</source>
+        <translation type="vanished">삭제</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">표시</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14200,17 +14279,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14241,7 +14320,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>제목</translation>
     </message>
@@ -14251,7 +14330,7 @@ Do you want to save message ?</source>
         <translation>보낸이</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>날짜</translation>
     </message>
@@ -14261,7 +14340,11 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">제목별로 정렬하려면 누르십시오</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>제목 검색</translation>
     </message>
@@ -14270,16 +14353,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14306,12 +14379,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14387,7 +14460,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14401,7 +14474,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14416,28 +14489,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14472,17 +14535,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14536,7 +14589,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -14546,7 +14599,7 @@ Do you want to save message ?</source>
         <translation>항목 제거</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14581,7 +14634,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>숨김</translation>
     </message>
@@ -14722,7 +14775,7 @@ Do you want to save message ?</source>
         <translation>동료 ID</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14732,7 +14785,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14746,13 +14799,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14785,13 +14832,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14801,12 +14853,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14839,7 +14891,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14860,7 +14912,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14890,19 +14942,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">검색</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14912,12 +14964,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14927,7 +14979,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15042,7 +15094,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15052,7 +15104,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15159,7 +15211,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15174,7 +15226,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15184,12 +15236,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15418,6 +15470,10 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">피드</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15427,7 +15483,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15447,12 +15503,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15467,7 +15523,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation>시험</translation>
     </message>
@@ -15478,19 +15534,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15498,7 +15552,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15637,12 +15691,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15687,7 +15736,12 @@ p, li { white-space: pre-wrap; }
         <translation>서명 포함</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">옵션</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15733,21 +15787,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>Retroshare (뒤에몫) </translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>오류 : 동료 세부 정보를 가져올 수 없습니다</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15765,7 +15819,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15834,6 +15888,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">비밀번호가 잘못된 것 같습니다</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15841,12 +15899,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15872,7 +15930,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>대화</translation>
     </message>
@@ -15893,7 +15951,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>항목 제거</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>이름:</translation>
     </message>
@@ -15933,7 +15991,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>메시지 작성</translation>
     </message>
@@ -15991,7 +16049,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>숨김</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16158,6 +16216,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">양식</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16170,6 +16235,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">답글 달기</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">요약</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16230,6 +16303,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">설명 추가</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16309,17 +16386,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16348,7 +16425,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16407,19 +16484,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16455,12 +16532,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>텍스트 레이블</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16671,27 +16748,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16744,7 +16806,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16764,8 +16826,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">설명</translation>
     </message>
@@ -16790,13 +16852,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">답글 달기</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16824,12 +16886,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>Retroshare (뒤에몫) </translation>
     </message>
@@ -16844,22 +16906,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">그림 파일 불러오기</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16875,17 +16927,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16895,7 +16937,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16915,22 +16957,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16945,7 +16977,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16956,7 +16988,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16966,7 +16998,7 @@ p, li { white-space: pre-wrap; }
         <translation>제목</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16974,12 +17006,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17013,7 +17045,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17051,17 +17083,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">텍스트 레이블</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17077,7 +17099,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -17092,17 +17114,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Loading</source>
+        <translation type="vanished">불러오는 중</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17115,18 +17136,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>설명</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
@@ -17137,12 +17158,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>답글 달기</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17152,7 +17173,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17162,17 +17183,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">숨김</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>항목을 읽음으로 설정하고 제거</translation>
     </message>
@@ -17182,7 +17203,7 @@ p, li { white-space: pre-wrap; }
         <translation>새 글</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17192,7 +17213,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -17233,11 +17254,34 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>불러오는 중</translation>
     </message>
 </context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">양식</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">새 글</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">다음</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">Retroshare (뒤에몫) </translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">이전</translation>
+    </message>
+</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17256,17 +17300,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17276,15 +17310,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17294,42 +17328,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished">텍스트 레이블</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17349,7 +17383,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">검색</translation>
     </message>
@@ -17379,17 +17413,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17404,17 +17438,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">레트로 쉐어 링크 복사</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17424,31 +17453,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">편집</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17463,7 +17488,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">가입</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17537,16 +17562,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">선택한 채널 없음</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17636,16 +17651,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17753,7 +17768,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17769,7 +17784,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17804,12 +17819,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17853,27 +17868,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17883,12 +17898,12 @@ and use the import button to load it</source>
         <translation type="unfinished">어디에서 :</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17918,13 +17933,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17936,22 +17951,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17966,7 +17971,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17981,24 +17986,34 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">그림 파일 불러오기</translation>
+        <source>From</source>
+        <translation type="vanished">보낸이</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">날짜</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18009,7 +18024,7 @@ and use the import button to load it</source>
         <translation type="unfinished">양식</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18028,7 +18043,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18038,7 +18053,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18065,7 +18080,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18075,7 +18090,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18095,7 +18110,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18211,7 +18226,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18219,42 +18234,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18286,7 +18296,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18294,8 +18304,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18563,12 +18573,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18599,7 +18609,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>예상치 못한 오류가 발생했습니다. &apos;RsInit::InitRetroShare unexpexted return code %1&apos; 을 보고해 주십시오.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18633,7 +18643,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18654,26 +18664,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18753,7 +18743,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18763,7 +18753,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18773,7 +18763,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18789,7 +18779,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18856,7 +18846,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18884,7 +18874,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19064,29 +19054,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">이름</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">상태</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19329,18 +19303,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19480,7 +19442,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19647,7 +19609,7 @@ p, li { white-space: pre-wrap; }
         <translation>양식</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19660,7 +19622,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19833,22 +19795,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19856,12 +19808,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20549,7 +20501,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">이름</translation>
@@ -20670,7 +20622,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">이름</translation>
     </message>
@@ -20690,7 +20642,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20746,7 +20698,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20760,6 +20712,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20773,11 +20730,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">보낸이</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20800,17 +20752,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20834,9 +20781,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20857,7 +20802,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>저장한 모든 레트로 쉐어 설정을 초기화합니다.</translation>
     </message>
@@ -20918,7 +20863,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>레트로 쉐어 언어를 설정합니다.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20939,7 +20884,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20969,7 +20914,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20987,7 +20932,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21004,12 +20949,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21070,7 +21015,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21085,7 +21030,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21185,23 +21130,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>다운로드</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>레트로 쉐어 링크 복사</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>레트로 쉐어 링크 보내기</translation>
     </message>
@@ -21211,7 +21156,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>다운로드</translation>
     </message>
@@ -21248,7 +21193,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>폴더</translation>
@@ -21259,17 +21204,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>새 레트로 쉐어 링크 만들기</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21289,7 +21234,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21297,7 +21242,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21313,22 +21258,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>항목 제거</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>지역:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21345,7 +21290,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>숨김</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21370,8 +21315,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21379,7 +21324,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>레트로 쉐어에서 여러분을 친구로 삼고 싶어합니다</translation>
     </message>
@@ -21410,7 +21355,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>확장</translation>
     </message>
@@ -21455,12 +21400,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>상태:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>메시지 작성</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21480,12 +21425,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">알 수 없음</translation>
     </message>
@@ -21495,17 +21445,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>숨김</translation>
     </message>
@@ -21515,7 +21455,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21525,12 +21465,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21589,12 +21529,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>지역 주소</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21615,22 +21555,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21643,16 +21583,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>이 웹사이트에서의 내 아이피 요청을 레트로 쉐어가 허용합니다:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21662,46 +21607,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21711,7 +21633,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21736,95 +21658,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21839,7 +21703,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21849,7 +21777,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21861,12 +21804,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21876,7 +21819,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21891,23 +21834,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21918,7 +21861,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21928,7 +21881,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21938,7 +21896,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21978,7 +21946,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21993,7 +21961,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22029,32 +22002,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22109,7 +22057,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22134,7 +22082,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22146,7 +22094,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22169,7 +22117,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>상태</translation>
     </message>
@@ -22229,28 +22177,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22266,18 +22203,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22312,12 +22249,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22340,22 +22277,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22390,7 +22327,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22400,12 +22337,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22485,7 +22422,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22495,12 +22432,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22519,7 +22456,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22539,17 +22476,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">취소</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22559,7 +22496,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22650,7 +22587,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22658,7 +22595,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22709,16 +22646,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22728,7 +22660,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>다운로드</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>레트로 쉐어 링크를 클립보드에 복사</translation>
     </message>
@@ -22743,7 +22675,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>레트로 쉐어 링크 보내기</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22759,7 +22691,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22784,7 +22716,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22927,12 +22859,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22956,7 +22888,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>로그인</translation>
     </message>
@@ -23295,7 +23227,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23532,7 +23464,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23568,15 +23500,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished">알 수 없음</translation>
     </message>
@@ -23586,13 +23515,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23602,57 +23536,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23660,7 +23549,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23670,7 +23559,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23681,12 +23570,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23714,7 +23602,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23725,7 +23613,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23735,27 +23623,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23840,7 +23723,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23849,12 +23732,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23879,12 +23757,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23949,7 +23822,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23959,17 +23837,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23997,7 +23865,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24025,19 +23893,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>이름</translation>
@@ -24244,12 +24112,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24274,7 +24137,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24295,7 +24158,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare (뒤에몫) </translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24328,17 +24191,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24353,7 +24206,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24480,18 +24333,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>경로</translation>
     </message>
@@ -24501,7 +24359,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24511,7 +24369,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24526,7 +24384,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24536,7 +24394,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24950,17 +24808,12 @@ p, li { white-space: pre-wrap; }
         <translation>양식</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">상태:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25000,27 +24853,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25030,12 +24873,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25172,7 +25015,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25187,7 +25030,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25275,7 +25118,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25310,7 +25153,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25340,18 +25183,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">기록</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>상태</translation>
     </message>
@@ -25372,7 +25211,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25455,7 +25294,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25470,7 +25318,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25490,7 +25338,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25520,17 +25368,25 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>New</source>
+        <translation type="vanished">새 피드</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">친구</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25593,42 +25449,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">양식</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">제거</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">지역:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25673,41 +25522,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">없음</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>알 수 없음</translation>
@@ -25785,7 +25604,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25822,7 +25641,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_nl.ts b/retroshare-gui/src/lang/retroshare_nl.ts
index bb4fef66a..c59474c60 100644
--- a/retroshare-gui/src/lang/retroshare_nl.ts
+++ b/retroshare-gui/src/lang/retroshare_nl.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Een opmerking toevoegen</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -121,12 +128,12 @@
         <translation>RetroShare: Geavanceerd Zoeken</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Zoek Criteria</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Voeg een volgend zoek criterium toe</translation>
     </message>
@@ -136,7 +143,7 @@
         <translation>Reset de zoekopdracht</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Annuleer de zoekopdracht</translation>
     </message>
@@ -156,6 +163,177 @@
         <translation>Zoeken</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Maak album</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Album Naam:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Categorie:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Beesten</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Familie</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Vrienden</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Bloemen</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Vakantie</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Landschappen</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Huisdieren</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Portretten</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Reizen</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Werk</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Willekeurig</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Onderschrift:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Waar:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotograaf</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beschrijving</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Deel Opties</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Beleid:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Kwaliteit</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Opmerkingen:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Identiteit:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Publiek</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Beperkt</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Resize Images (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Resize Images (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Stuur de originele plaatjes</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Geen opmerkingen toegestaan</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Toegevoegde opmerkingen</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Opmerkingen toegestaan</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Publiceer met de identiteit</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Sleep &amp;amp; laat los om plaatjes in te voegen. Klik op een plaatje om de gegevens eronder te bewerken.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Terug</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Foto&apos;s toevoegen</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Publiceer Album</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Verwijder Album Titel</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Vertel iets over dit album...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Waar zijn deze genomen?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Laad album miniatuur</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -164,11 +342,19 @@
         <source>Album</source>
         <translation>Album</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Album miniatuur</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Overzicht</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -184,6 +370,34 @@
         <source>Caption</source>
         <translation>Onderschrift</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Waar:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Wanneer</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beschrijving:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Deel Opties</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Opmerkingen</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Publiceer Identiteit</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Zichtbaarheid</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -552,7 +766,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Waarschuwing: Deze service is experimenteel. Help ons door dit te testen.⏎
@@ -568,6 +782,14 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <source>Circles</source>
         <translation>Cirkels</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">GxsForums</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">GxsKanalen</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -579,23 +801,10 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation>Foto &apos;s</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -632,13 +841,17 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Avatar toevoegen</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Uw Avatar afbeelding instellen</translation>
     </message>
@@ -657,6 +870,10 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Laad Avatar</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -725,10 +942,22 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation>Opnieuw instellen</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Ontvang ranglijst</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Verzend ranglijst</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Altijd op de voorgrond</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stijl</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -744,11 +973,23 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <source>% Opaque</source>
         <translation>Ondoorzichtig</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Opslaan</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Annuleren</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Sinds</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Verberg instellingen</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -821,7 +1062,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -851,12 +1092,12 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -864,7 +1105,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Stemmen van</translation>
     </message>
@@ -884,7 +1125,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +1163,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Stemmen van</translation>
     </message>
@@ -942,7 +1183,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -972,7 +1213,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Verander boodschap gelezen status</translation>
     </message>
@@ -982,7 +1223,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">Nieuw</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
@@ -990,12 +1231,12 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Ik vind dit leuk!</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1015,18 +1256,18 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Uitbreiden</translation>
     </message>
@@ -1041,12 +1282,12 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished">Item verwijderen</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1215,17 +1456,17 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Kanalen</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Tabbladen</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
@@ -1235,17 +1476,11 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Downloads</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Laad berichten op achtergrond (draad)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Elk kanaal in een nieuw tabblad openen</translation>
     </message>
@@ -1253,7 +1488,7 @@ Maar onthoudt: Elke data hier *ZAL* verloren gaan als de protocollen een update
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1276,7 +1511,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Ik vind dit leuk!</translation>
     </message>
@@ -1301,18 +1536,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Uitbreiden</translation>
     </message>
@@ -1327,7 +1562,7 @@ into the image, so as to
         <translation type="unfinished">Item verwijderen</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
@@ -1337,7 +1572,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1345,7 +1590,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
@@ -1536,7 +1781,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Toon chat Portaal</translation>
     </message>
@@ -1548,6 +1793,22 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">U heeft %1 nieuwe berichten</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">U heeft %1 nieuw bericht</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 nieuwe berichten</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 nieuw bericht</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1569,14 +1830,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Onbekende Lobby</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Verwijder alles</translation>
     </message>
@@ -1584,13 +1844,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Count</translation>
     </message>
@@ -1600,7 +1860,29 @@ into the image, so as to
         <translation>Onderwerp</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1610,7 +1892,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1667,12 +1949,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1682,31 +1964,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Maak een nieuw chat Portaal</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Geen onderwerp ingevoerd]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Gekozen portaal gegevens</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Prive</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Publiek</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1716,25 +1998,42 @@ Double click a chat room to enter and chat.</source>
         <translation>Niet Automatisch Abonneren</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Automatisch Abonneren</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Zoek Chat lobby &apos;s</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Zoek Naam</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Geabonneerd</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Kolommen</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Nee</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1746,47 +2045,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Onderwerp:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Verbindingen:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
@@ -1801,24 +2100,13 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Toon</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation type="unfinished"></translation>
@@ -1832,7 +2120,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Item verwijderen</translation>
     </message>
@@ -1877,7 +2165,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
@@ -1892,7 +2180,19 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Chat Settings</source>
+        <translation type="vanished">Chat instellingen</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Inschakelen Emoticons Privé Chat</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Inschakelen Emoticons Groep Chat</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Activeer eigen lettertype</translation>
     </message>
@@ -1912,7 +2212,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Activeer &quot;Schuin&quot;</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1937,7 +2237,11 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished">Ingesloten afbeeldingen laden</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Chat portaal</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Knipper &quot;tab&quot; ikoon</translation>
     </message>
@@ -1946,6 +2250,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Privé Chat</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1967,7 +2275,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Knipper &quot;scherm/tab&quot; ikoon</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Chat Font</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Verander de Chat Font</translation>
     </message>
@@ -1977,10 +2289,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Chat Font:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Geschiedenis</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stijl</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1995,13 +2311,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Groeps chat</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Privé Chat</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2065,28 +2385,22 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p align=&quot;justify&quot;&gt; op dit tabblad kunt u instellen hoeveel chatberichten Retroshare blijft opgeslagen op de schijf en hoeveel van de vorige conversatie wordt weergegeven, voor de verschillende chat-systemen. De maximale opslagperiode te ontdoen van oude berichten en voorkomt u dat de chatgeschiedenis uit te vullen met vluchtige chat (bijvoorbeeld chat lobby&apos;s en verre chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Chatlobbies</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Ingeschakeld:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2096,17 +2410,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2153,7 +2457,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished">Beschrijving</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2203,7 +2507,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Maximale opslagperiode, in dagen (0 = houden alle):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Standaard zoeken</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Hoofdletter gevoelig</translation>
     </message>
@@ -2309,7 +2617,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Toon chat</translation>
     </message>
@@ -2345,7 +2653,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
@@ -2380,12 +2688,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Schuin</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2465,6 +2773,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2502,7 +2815,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>typt....</translation>
     </message>
@@ -2524,7 +2837,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Wil je echt voorgoed de geschiedenis verwijderen?</translation>
     </message>
@@ -2574,7 +2887,7 @@ after HTML conversion.</source>
         <translation>is bezig en kan mogelijk niet reageren</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Zoek hoofdlettergevoelig</translation>
     </message>
@@ -2596,7 +2909,7 @@ after HTML conversion.</source>
         <translation>Niet stoppen met kleuren na X items gevonden (meer CPU nodig)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Zoek vorige&lt;/b&gt; &lt;br/&gt;&lt;i&gt;Ctrl + Shift + G&lt;/i&gt;</translation>
     </message>
@@ -2611,12 +2924,16 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Vinden&lt;/b&gt; &lt;br/&gt;&lt;i&gt;Ctrl + F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Status)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Tekst instellen lettertype &amp; kleur</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Een bestand toevoegen</translation>
     </message>
@@ -2632,12 +2949,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Markeer deze geselecteerde tekst&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl + M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2648,12 +2965,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation> objecten gevonden.</translation>
     </message>
@@ -2673,7 +2990,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Typ een bericht hier</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2699,7 +3016,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Toon details:</translation>
     </message>
@@ -2721,7 +3038,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Persoonlijke Cirkels</translation>
     </message>
@@ -2747,7 +3064,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Vrienden</translation>
     </message>
@@ -2807,7 +3124,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Vrienden van Vrienden</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Externe Cirkels (Administrator)</translation>
     </message>
@@ -2823,7 +3140,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Cirkels</translation>
     </message>
@@ -2875,45 +3192,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: kan geen verbindings gegevens vinden.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2923,7 +3240,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Versleuteling</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation>Niet verbonden</translation>
     </message>
@@ -3005,17 +3322,12 @@ Double click on it to add his name on text writer.</source>
         <translation>Geen</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3035,7 +3347,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3052,16 +3364,104 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Wizard verbinding maken met een vriend</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Voeg een nieuwe vriend toe</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;U heeft een certificaat bestand gekregen van een vriend</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;Maak een vriend met geselecteerde vrienden van mijn vrienden</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Inclusief handtekeningen</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Kopieer uw certificaat naar het klembord</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Sla uw Certificaat op in een bestand</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Start Email programma</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Certificaat bestanden</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Gebruik opgeslagen certificaat bestanden</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Importeer een vriend certificaat...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">U moet een certificaat bestand maken en aan een vriend sturen. U kunt een reeds eerder gemaakt bestand gebruiken.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Exporteer mijn certificaat...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Sleep en plaats uw vriends certificaat in dit scherm of tik de lokatie van het bestand in onderstaande venster</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Bladeren</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Vrienden van vrienden</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Kies nu met wie je vrienden wilt worden</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Toon me:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Wordt vriend met deze verbindingen</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare ID</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Gebruik RetroShare ID om een vriend toe te voegen die al in je netwerk beschikbaar is.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Voeg je vriend&apos;s RetroShare ID toe</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Plak je vriend&apos;s RetroShare ID in het veld hieronder</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Enter de RetroShare ID van je vriend, zoiets als verbinding@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3103,7 +3503,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Nodig vrienden uit via email</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Vul het email adres van uw  vriend of vrienden in (elke gescheiden door een ;)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Uw vriend&apos;s email adres:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Enter uw vriend&apos;s email adres:</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Onderwerp:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3119,32 +3539,44 @@ Double click on it to add his name on text writer.</source>
         <translation>Gegevens van uw aanvraag</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Verbindings details</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Email:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Knooppunt</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Woonplaats:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Voeg het certificaat handmatig in</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Voeg een vriend toe aan een groep:</translation>
     </message>
@@ -3154,7 +3586,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Verifieer vriend (Teken PGP Sleutel)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3179,22 +3611,16 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Voeg toe als vriend om mee verbonden te worden</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Om je vriend&apos;s verzoek te accepteren klik de Klaar knop</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Sorry, een error verscheen</translation>
     </message>
@@ -3214,27 +3640,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Gegevens van uw vriend:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Sleutel deugdelijkheid:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Ondertekenaars</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Deze verbinding staat al op je vriend zijn lijst. Toevoegen stelt waarschijnlijk alleen zijn ip adres in.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3280,17 +3711,45 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Certificaat fout</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Kan geen verbindings details krijgen van de PGP sleutel %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Iedere verbinding die ik niet bevestigd hebt</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Vrienden van vrienden die me al vertrouwen</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Bevestigde verbindingen tonen als geweigerd</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Verbindings naam</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Ook ondertekend door</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Verbindings ID</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare uitnodiging</translation>
     </message>
@@ -3310,12 +3769,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3323,7 +3782,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3363,7 +3822,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>U heeft een aanvraag om vriend te worden</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3388,7 +3847,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3398,7 +3857,47 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Certificaat laden lukt niet: bestand %1 niet gevonden</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Deze verbinding %1 is niet beschikbaar in je netwerk</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Gebruik nieuw certificaat format (veiliger)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Gebruik oude (backward compatible) certificaat format</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Verwijder handtekeningen</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">RetroShare uitnodiging</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Connect vriend help</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">U kunt deze tekst kopiëren en naar een vriend sturen via mail of een andere manier</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Uw certificaat is op het klembord geplaatst, plak en stuur het naar een vriend via email of op een andere manier</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Sla op als...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3437,7 +3936,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Geen ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Gebruiken als directe bron indien mogelijk</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>IP-Adr:</translation>
     </message>
@@ -3447,7 +3950,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP Adres:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3466,13 +3969,41 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Alle vrienden aan elke anderen aanbevelen</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Vriend aanbevelingen</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Bericht:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Aanbevolen vrienden</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Aan</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Selecteer minstens één vriend om aan te bevelen.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Selecteer minstens één vriend als ontvanger.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Sleutel toevoegen aan keyring</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Deze sleutel is al in uw keyring</translation>
     </message>
@@ -3485,7 +4016,7 @@ even if you don&apos;t make friends.</source>
         <translation>Schakel dit selectievakje in om de sleutel toe te voegen aan uw sleutelverzameling. Dit kan handig zijn voor het verzenden van verre berichten naar deze verbinding, zelfs als u vrienden maakt.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Certificaat heeft verkeerde versienummer. Vergeet niet dat v0.6 en v0.5 netwerken niet compatibel zijn.</translation>
     </message>
@@ -3520,7 +4051,7 @@ even if you don&apos;t make friends.</source>
         <translation>IP toevoegen aan whitelist</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>Geen IP in dit certificaat</translation>
     </message>
@@ -3530,10 +4061,23 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Toegevoegd met certificaat van %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Certificaat van vriend plakken uit het klempbord</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Certificaat laden lukt niet: kan niet lezen van bestand %1</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3595,7 +4139,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>UDP setup</translation>
     </message>
@@ -3623,7 +4167,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Verbindings assistent</translation>
     </message>
@@ -3633,20 +4177,17 @@ p, li { white-space: pre-wrap; }
         <translation>Niet werkende Peer ID</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Onbekende status</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Achter Symmetric NAT</translation>
     </message>
@@ -3656,14 +4197,12 @@ p, li { white-space: pre-wrap; }
         <translation>Achter NAT &amp; geen DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Herstarten netwerk</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>Achter NAT</translation>
     </message>
@@ -3673,8 +4212,7 @@ p, li { white-space: pre-wrap; }
         <translation>Geen DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>Net status ok!</translation>
     </message>
@@ -3699,7 +4237,7 @@ p, li { white-space: pre-wrap; }
         <translation>Zoek RS Peers</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Lookup heeft DHT nodig</translation>
     </message>
@@ -3991,7 +4529,7 @@ p, li { white-space: pre-wrap; }
         <translation>Probeer opnieuw de volledige certificaat te importeren</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3999,8 +4537,7 @@ p, li { white-space: pre-wrap; }
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>ONCONTROLEERBARE DOORSTURINGEN!</translation>
     </message>
@@ -4010,7 +4547,7 @@ p, li { white-space: pre-wrap; }
         <translation>ONCONTROLEERBARE DOORSTURING &amp; GEEN DHT</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Zoeken</translation>
     </message>
@@ -4046,12 +4583,12 @@ p, li { white-space: pre-wrap; }
         <translation>Cirkel Gegevens</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4071,7 +4608,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>IDs</translation>
     </message>
@@ -4091,18 +4628,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filter</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4117,7 +4654,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Type</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Naam:</translation>
     </message>
@@ -4157,19 +4702,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Kies een naam voor uw Cirkel</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Geen Restrictie Cirkel Geselecteerd</translation>
     </message>
@@ -4179,24 +4724,12 @@ p, li { white-space: pre-wrap; }
         <translation>Geen Cirkel Limitaties Geselecteerd</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
@@ -4206,7 +4739,7 @@ p, li { white-space: pre-wrap; }
         <translation>Verwijder</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Zoek</translation>
@@ -4221,6 +4754,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Getekend</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Ondertekend door bekende knooppunten</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4237,6 +4774,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP identiteit</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Anoniem ID</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4259,13 +4800,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">Maak</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP geaccocieerd ID</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4284,7 +4829,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maak een groep</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished">Groeps Naam:</translation>
     </message>
@@ -4319,7 +4864,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Nieuw kanaal bericht</translation>
     </message>
@@ -4329,7 +4874,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanaal bericht</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4390,11 +4935,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Gebruik Slepen en Neerzetten / Voeg Bestanden Toe knop om nieuwe bestanden te indexeren.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Kopieer en plak RetroShare links van je gedeelden.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Voeg bestand toe</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Voeg kanaal miniatuur toe</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Bericht</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Onderwerp</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4480,17 +5037,17 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4509,18 +5066,17 @@ p, li { white-space: pre-wrap; }⏎
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Bestand is reeds toegevoegd en in de hash opgenomen</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Voeg een onderwerp toe</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Laad miniatuur plaatje</translation>
     </message>
@@ -4535,12 +5091,18 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Massa gegevens genereren</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Wilt u echt %1 berichten genereren?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>U gaat nu bestanden toevoegen die niet gedeeld zijn. Weet u zeker dat u dat wilt?</translation>
     </message>
@@ -4574,7 +5136,7 @@ p, li { white-space: pre-wrap; }⏎
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Post forum bericht</translation>
     </message>
@@ -4583,6 +5145,10 @@ p, li { white-space: pre-wrap; }⏎
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Onderwerp</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4603,8 +5169,8 @@ p, li { white-space: pre-wrap; }⏎
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4623,7 +5189,7 @@ p, li { white-space: pre-wrap; }
         <translation>U kunt bestanden toevoegen via Slepen en Neerzetten in dit scherm</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4653,17 +5219,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Geen Forum</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>In antwoord op</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Titel</translation>
     </message>
@@ -4716,7 +5282,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Laad images bestand</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4726,8 +5292,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Massa gegevens genereren</translation>
     </message>
@@ -4736,6 +5302,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Wilt u echt %1 berichten genereren?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Verstuur</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4750,7 +5320,23 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Maak een nieuw chat portaal</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Een chat portaal is een centraal en anonieme chat groep. Alle deelnemers ontvangen alle berichten. Zodra er een nieuw portaal is opgericht kunt u vrienden uitnodigen via de &quot;Vrienden&quot; knop.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Portaal naam:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Portaal onderwerp</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4785,7 +5371,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Maak</translation>
     </message>
@@ -4795,7 +5381,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>PGP-ondertekende identiteiten vereisen</translation>
     </message>
@@ -4810,7 +5396,11 @@ Do you want to discard this message?</source>
         <translation>Kies de vrienden met wie je een groeps chat wil</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Uitgenodigde vrienden</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4831,7 +5421,7 @@ Do you want to discard this message?</source>
         <translation>Contacts:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4839,17 +5429,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Publieke informatie</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Woonplaats:</translation>
     </message>
@@ -4859,12 +5449,12 @@ Do you want to discard this message?</source>
         <translation>Locatie ID:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Software Versie:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Online sinds:</translation>
     </message>
@@ -4884,7 +5474,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4894,7 +5489,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Andere informatie</translation>
     </message>
@@ -4904,12 +5499,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Certificaat</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4919,7 +5519,11 @@ Do you want to discard this message?</source>
         <translation>Inclusief handtekeningen</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Sla sleutel op in een bestand</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exporteer identiteit</translation>
     </message>
@@ -4993,33 +5597,33 @@ en daar de importeer functie gebruiken</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>PGP vingerafdruk:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Knooppunt informatie</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP-Id:</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Vriend knooppunten:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5058,6 +5662,14 @@ en daar de importeer functie gebruiken</translation>
         <source>Node</source>
         <translation>Knooppunt</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Maal nieuw knooppunt</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">toon statistieken scherm</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5109,7 +5721,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5777,7 +6389,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Start bestand</translation>
     </message>
@@ -5785,38 +6397,38 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>naar</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>negeer</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>dd.MM.yyyy</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5824,12 +6436,12 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Expression Widget</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Verwijder deze Expression</translation>
     </message>
@@ -5991,7 +6603,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>PLaatje</translation>
     </message>
@@ -6001,7 +6613,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6061,21 +6673,11 @@ en daar de importeer functie gebruiken</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Vrienden directories</translation>
     </message>
@@ -6197,7 +6799,7 @@ en daar de importeer functie gebruiken</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6239,7 +6841,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Toon groepen</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Groep</translation>
     </message>
@@ -6275,7 +6877,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Voeg toe aan groep</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Zoeken</translation>
@@ -6291,7 +6893,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Sorteer per datum</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6502,7 +7104,7 @@ at least one peer was not added to a group</source>
     <message>
         <location line="+5"/>
         <source>To</source>
-        <translation type="unfinished">Naar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+34"/>
@@ -6528,7 +7130,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Bevestig vriend verzoek</translation>
     </message>
@@ -6545,6 +7147,10 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Zoeken:</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6566,7 +7172,7 @@ at least one peer was not added to a group</source>
         <translation>Zoek vrienden</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Selecteer alles</translation>
     </message>
@@ -6577,132 +7183,16 @@ at least one peer was not added to a group</source>
         <translation>Selecteer geen</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Naam</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Maak een vriend</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Bewerk berichten status</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Uitzenden</translation>
     </message>
@@ -6785,38 +7275,33 @@ Also check your ports!</source>
         <translation>Reset lettertype naar standaard</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Sleutelbos</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retroshare groepschat: berichten worden verstuurd naar alle verbonden vrienden.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Netwerk grafiek</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Stel hier uw statusbericht in.</translation>
     </message>
@@ -6834,17 +7319,7 @@ Also check your ports!</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Alle velden moet minimaal 3 karakters bevatten</translation>
     </message>
@@ -6854,12 +7329,17 @@ Also check your ports!</source>
         <translation>Wachtwoorden komen niet overeen</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6880,38 +7360,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6931,12 +7411,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6946,43 +7426,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7026,13 +7501,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7042,7 +7517,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7077,7 +7552,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7087,7 +7562,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7097,7 +7577,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7323,13 +7808,36 @@ and use the import button to load it</source>
         <translation>We gaan starten</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Nodig vrienden uit</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;⏎
+&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:12pt;&quot;&gt;RetroShare is niets zonder uw vrienden. Klik op de knop om het proces te starten.&lt;/span&gt;&lt;/p&gt;⏎
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email een uitnodiging met uw &amp;quot;ID Certificaat&amp;quot; aan uw vrienden.&lt;/span&gt;&lt;/p&gt;⏎
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Wees zeker dat u een uitnodiging terugkrijgt... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;U kunt alleen verbinding maken met een vriend als u beide elkaar heeft toegevoegd.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Nodig jouw vrienden uit voor RetroShare</translation>
     </message>
@@ -7339,103 +7847,89 @@ and use the import button to load it</source>
         <translation>Voeg vrienden toe</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Maak verbinding met vrienden</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Geavanceerd: Open een poort in je Firewall</translation>
-    </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Maak verbinding met vrienden</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Geavanceerd: Open een poort in je Firewall</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Meer Help en Ondersteuning</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Open RetroShare Website</translation>
     </message>
@@ -7460,7 +7954,7 @@ p, li { white-space: pre-wrap; }
         <translation>Email terugkoppeling</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare uitnodiging</translation>
     </message>
@@ -7510,12 +8004,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare terugkoppeling</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>RetroShare ondersteuning</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7639,7 +8133,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Toon groeps chat</translation>
     </message>
@@ -7647,7 +8141,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7817,7 +8311,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
@@ -7830,12 +8324,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7860,7 +8354,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort by Name</source>
+        <translation type="vanished">Sorteer op naam</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Sorteer op populariteit</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Sorteer op laatste post</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7875,14 +8381,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Het laatste bericht</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
@@ -7893,13 +8399,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Populariteit</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Toon</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7912,7 +8422,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>en</translation>
     </message>
@@ -8048,7 +8558,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanalen</translation>
@@ -8059,22 +8569,22 @@ p, li { white-space: pre-wrap; }
         <translation>Maak een nieuw kanaal</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Activeer automatisch downloaden</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Mijn Kanalen</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Geabonneerde kanalen</translation>
     </message>
@@ -8094,12 +8604,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Automatisch downloaden uitschakelen</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8134,22 +8644,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Bespelen</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Open map</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -8169,17 +8679,17 @@ p, li { white-space: pre-wrap; }
         <translation>Controleren</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Weet u zeker dat u wilt annuleren en daarna het bestand te verwijderen?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Kan de map niet openen</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Speel bestand</translation>
     </message>
@@ -8189,10 +8699,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Bestand %1 bestaat niet op deze locatie</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulier</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Bestandsnaam</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Grootte</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Titel</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Gepubliceerd</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Status</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Maak een nieuw kanaal</translation>
     </message>
@@ -8230,19 +8767,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Tekst label</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Registreer bij dit kanaal</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8256,7 +8783,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -8271,7 +8798,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanaal beschrijving</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Laden</translation>
     </message>
@@ -8286,9 +8813,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
+        <source>New Channel</source>
+        <translation type="vanished">Nieuw kanaal</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8299,7 +8825,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8320,7 +8846,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Bespelen</translation>
     </message>
@@ -8376,24 +8902,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Bestanden</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Waarschuwing! U heeft minder dan %1 uur en %2 minuten voordat dit bestand verwijderd is. Overweeg om het op te slaan.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Opmerking</translation>
     </message>
@@ -8408,17 +8938,21 @@ p, li { white-space: pre-wrap; }
         <translation>Ik vindt dit niet leuk</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8443,16 +8977,87 @@ p, li { white-space: pre-wrap; }
         <translation>Speel media</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Post op dit kanaal</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Zoek kanalen</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Titel</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Zoek Titel</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Bericht</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Zoek bericht</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Bestandsnaam</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Zoek bestandsnaam</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Geen kanaal geselecteerd</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Automatisch downloaden uitschakelen</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Activeer automatisch downloaden</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Toon feeds</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Bestanden weergeven</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Feeds</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Bestanden</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beschrijving:</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Post op dit kanaal</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8522,7 +9127,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8558,7 +9163,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Opmerkingen</translation>
     </message>
@@ -8573,13 +9178,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Feeds</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8594,7 +9199,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8609,7 +9214,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8669,22 +9274,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8759,13 +9354,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Geabonneerd</translation>
     </message>
@@ -8816,17 +9410,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8941,7 +9535,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Opmerkingen container</translation>
     </message>
@@ -8954,7 +9548,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8984,7 +9578,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ververs</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Opmerkingen</translation>
@@ -9023,7 +9617,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Antwoord op een opmerking</translation>
     </message>
@@ -9047,21 +9641,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Stem omlaag</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9071,7 +9650,7 @@ p, li { white-space: pre-wrap; }
         <translation>Geef een opmerking</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9100,10 +9679,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Opmerking&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Getekend door</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9132,7 +9727,7 @@ before you can comment</source>
 voor je een opmerking kan doen</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9174,6 +9769,14 @@ voor je een opmerking kan doen</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Toevoegen van Forum beheerders</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Selecteer Forum beheerders</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9183,7 +9786,7 @@ voor je een opmerking kan doen</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Registreer bij dit forum</translation>
     </message>
@@ -9199,7 +9802,7 @@ voor je een opmerking kan doen</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -9219,9 +9822,8 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Tekst label</translation>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9252,13 +9854,13 @@ voor je een opmerking kan doen</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Onderwerp:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Uitschrijven bij dit forum</translation>
     </message>
@@ -9269,7 +9871,7 @@ voor je een opmerking kan doen</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -9289,17 +9891,21 @@ voor je een opmerking kan doen</translation>
         <translation>In antwoord op: </translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Forum Feed</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
@@ -9312,66 +9918,63 @@ voor je een opmerking kan doen</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Start een nieuw draadje in het geselecteerde forum</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Zoek forums</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Het laatste bericht</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished">Nieuw draadje</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Threaded View</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Flat View</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Laden</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9381,7 +9984,12 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Beantwoord bericht</translation>
     </message>
@@ -9405,6 +10013,10 @@ voor je een opmerking kan doen</translation>
         <source>Download all files</source>
         <translation>Download alle bestanden</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Volgende ongelezen</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9421,23 +10033,31 @@ voor je een opmerking kan doen</translation>
         <translation>Zoek Auteur</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Inhoud</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Zoek Inhoud</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Geen naam</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Antwoord</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9480,12 +10100,16 @@ voor je een opmerking kan doen</translation>
         <translation>Kopieer RetroShare Link</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Uitbreiden</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9515,8 +10139,8 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9530,6 +10154,22 @@ voor je een opmerking kan doen</translation>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anoniem</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">Getekend</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">Geen</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Bericht ontbreekt ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9599,12 +10239,12 @@ voor je een opmerking kan doen</translation>
         <translation>Origineel bericht</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">Bewerk</translation>
     </message>
@@ -9665,7 +10305,7 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9685,7 +10325,7 @@ voor je een opmerking kan doen</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9737,7 +10377,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9747,7 +10387,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9762,7 +10402,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9828,12 +10468,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forums</translation>
@@ -9864,16 +10504,35 @@ This message is missing. You should receive it later.</source>
         <translation>Andere forums</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Wachten</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Ontvangen</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Ikoon toevoegen</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Sleutel ontvangers kunnen voor een beperkte groep publiceren en kunnen kijken en publiceren op Privé actige Kanalen.</translation>
     </message>
@@ -9882,14 +10541,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Deel Publieke Sleutel</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">Controleer welke verbinding je wilt delen met een openbare Privé Sleutel</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Deel sleutel met</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Beschrijving</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Berichten Distributie</translation>
     </message>
@@ -9897,7 +10564,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Publiek</translation>
     </message>
@@ -9916,6 +10583,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nieuw draadje</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Benodigd</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Versleutelde berichten</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9957,7 +10632,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished">Opmerkingen:</translation>
     </message>
@@ -9980,7 +10655,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9996,12 +10671,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10018,23 +10693,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10050,28 +10725,30 @@ This message is missing. You should receive it later.</source>
         <translation>Voeg een naam toe</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Laad groep logo</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Groep wijzigingen verzenden</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Mislukt te bereiden groep metagegevens - Lees</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Zal worden gebruikt voor het verzenden van feedback</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Eigenaar:</translation>
     </message>
@@ -10081,12 +10758,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10096,7 +10773,7 @@ This message is missing. You should receive it later.</source>
         <translation>Het laatste bericht</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10171,12 +10848,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Populariteit</translation>
     </message>
@@ -10192,22 +10864,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Maak</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Auteur</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10215,7 +10892,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Laden</translation>
     </message>
@@ -10275,7 +10952,7 @@ This message is missing. You should receive it later.</source>
         <translation>Bewerk Details</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10332,12 +11009,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopieer RetroShare Link</translation>
     </message>
@@ -10360,7 +11037,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Geen handtekening</translation>
     </message>
@@ -10373,24 +11050,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Niet gevonden</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Geen handtekening</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Verificatie</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>onbekende sleutel</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">anoniem</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10400,12 +11093,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10425,14 +11113,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10444,7 +11124,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10492,13 +11172,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10639,7 +11323,7 @@ This message is missing. You should receive it later.</source>
     <message>
         <location line="+31"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished">Onbekenden verbinding</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+42"/>
@@ -10879,7 +11563,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10895,7 +11579,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
@@ -10914,7 +11598,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10992,7 +11676,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +11686,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11030,7 +11714,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11040,7 +11724,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Kopieer uw certificaat naar het klembord</translation>
     </message>
@@ -11050,7 +11734,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Sla uw Certificaat op in een bestand</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11070,37 +11754,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11112,12 +11772,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11132,7 +11792,12 @@ new short format</source>
         <translation type="unfinished">RetroShare uitnodiging</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished">Sla op als...</translation>
     </message>
@@ -11397,14 +12062,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Reputatie</translation>
     </message>
@@ -11414,12 +12079,12 @@ p, li { white-space: pre-wrap; }
         <translation>Zoek</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>Anoniem Id</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Maak een nieuwe identiteit</translation>
     </message>
@@ -11429,7 +12094,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11444,27 +12109,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished">Sluiten</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11480,39 +12145,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Cirkels</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11532,20 +12187,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Persoonlijke Cirkels</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished">Identiteit aanpassen</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Chat met deze verbinding</translation>
     </message>
@@ -11555,78 +12208,78 @@ p, li { white-space: pre-wrap; }
         <translation>Start een chat met deze verbinding</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation>Eigenaar knooppunt-ID:</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Identiteitsnaam:</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Verstuur bericht</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Identiteit ID:</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Knooppuntnaam van de eigenaar:</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11637,17 +12290,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anoniem</translation>
     </message>
@@ -11662,24 +12315,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Deze identiteit is eigendom van u</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11694,12 +12347,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11709,7 +12357,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11784,7 +12432,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11814,7 +12462,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">onbekend</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11829,7 +12477,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished">Bewerk Cirkel</translation>
     </message>
@@ -11877,7 +12525,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11885,7 +12533,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11928,7 +12576,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Anonieme identiteit</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12008,7 +12656,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12024,12 +12672,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12134,7 +12787,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12184,21 +12837,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Mensen</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12208,7 +12861,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12223,7 +12876,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12238,12 +12891,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12263,12 +12916,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12278,7 +12931,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12286,7 +12939,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Gebruikersnaam</translation>
     </message>
@@ -12316,7 +12969,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudoniem</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12326,19 +12979,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Nieuwe identiteit</translation>
     </message>
@@ -12352,7 +12998,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12362,12 +13008,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Identiteit aanpassen</translation>
@@ -12378,27 +13019,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12418,7 +13059,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12428,7 +13069,11 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Fout bij ophalen sleutel!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>SleutelID is ongeldig</translation>
     </message>
@@ -12443,7 +13088,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Onbekende echte naam</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Maak een nieuwe identiteit</translation>
     </message>
@@ -12453,15 +13098,10 @@ These identities will soon be not supported anymore.</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Verwijderen</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12487,7 +13127,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Maak</translation>
     </message>
@@ -12497,13 +13137,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12513,7 +13153,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12587,7 +13227,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Kopieer</translation>
     </message>
@@ -12597,12 +13237,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Merk alles</translation>
     </message>
@@ -12621,38 +13261,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Citaat</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Verstuur</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12670,32 +13298,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Poort:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12716,12 +13339,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12730,31 +13348,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Open bestand</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Open map</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Controleren...</translation>
     </message>
@@ -12764,7 +13377,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Controleer bestanden</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12792,7 +13405,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Vriend toevoegen</translation>
     </message>
@@ -12808,8 +13421,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
@@ -12830,7 +13442,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Stoppen</translation>
     </message>
@@ -12841,12 +13453,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Snel start Wizard</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 is een beveiligd gedecentraliseerde communicatie platform</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Niet afgemaakt</translation>
     </message>
@@ -12874,12 +13486,11 @@ Maak meer ruimte vrij en klik Ok.</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Notify</translation>
     </message>
@@ -12890,35 +13501,31 @@ Maak meer ruimte vrij en klik Ok.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Open berichten</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Grafische bandbreedte</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Applicaties</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Minimalisser</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Maximalisseer</translation>
     </message>
@@ -12933,12 +13540,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 nieuw bericht</translation>
     </message>
@@ -12968,7 +13570,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>%1 vrienden verbonden</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Wil je RetroShare stoppen?</translation>
     </message>
@@ -12988,7 +13590,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Toon</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Wees er zeker van dat deze link je niet naar een verdachte website stuurt</translation>
     </message>
@@ -13033,13 +13635,12 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Service toestemming matrix</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13054,7 +13655,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13063,17 +13664,17 @@ Maak meer ruimte vrij en klik Ok.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Opstellen</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Paragraph</translation>
     </message>
@@ -13109,12 +13710,12 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Kop 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Letter grootte</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Verklein letter grootte</translation>
     </message>
@@ -13129,32 +13730,32 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Vet</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Schuin</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Uitlijning</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Voeg een plaatje toe</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Zet lettertype om in code stijl</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Onderlijnd</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Onderwerp:</translation>
     </message>
@@ -13165,32 +13766,32 @@ Maak meer ruimte vrij en klik Ok.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Labels</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Aanbevolen bestanden</translation>
     </message>
@@ -13260,7 +13861,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>Voeg een citaat blok toe</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Verstuur naar:</translation>
     </message>
@@ -13300,7 +13901,7 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hallo,&lt;br&gt;ik wil een goede vriend van mij aanraden; als je mij vertrouwd kun je hem ook vertrouwen. &lt;br&gt;</translation>
     </message>
@@ -13320,18 +13921,18 @@ Maak meer ruimte vrij en klik Ok.</translation>
         <translation>wil vrienden met je zijn op RetroShare</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hi %1,&lt;br&gt;&lt;br&gt;%2 wil vrienden met je zijn op RetroShare&lt;br&gt;&lt;br&gt;Reageer nu:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Bedankt,&lt;br&gt;Het RetroShare Team</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Bewaar bericht</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Bericht is niet verzonden.⏎
@@ -13343,17 +13944,7 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>PLak RetroShare Link</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Voeg toe aan &quot;Aan&quot;</translation>
     </message>
@@ -13373,7 +13964,7 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Voeg toe als &quot;Aanbevolen&quot;</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Origineel bericht</translation>
     </message>
@@ -13383,21 +13974,21 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Van</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Naar</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Zenden</translation>
     </message>
@@ -13412,7 +14003,7 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Op %1, %2 schreef:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Antw:</translation>
     </message>
@@ -13422,30 +14013,30 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Doorst:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Wil je dit bericht versturen zonder onderwerp?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Voeg minstens één ontvanger toe.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
@@ -13560,13 +14151,13 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation type="unfinished">Gegevens</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Open bestand...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML- bestand (*.htm *.html );;Alle bestanden (*)</translation>
     </message>
@@ -13586,7 +14177,7 @@ Wil je het bericht bewaren in de concepten map?</translation>
         <translation>Export PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Bericht is niet verzonden.⏎
@@ -13608,7 +14199,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Voeg extra bestand toe</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13638,18 +14229,18 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Van:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13689,13 +14280,13 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13705,12 +14296,12 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13788,7 +14379,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Standaard</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Een nieuwe tab</translation>
     </message>
@@ -13798,7 +14389,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Een nieuw scherm</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Bewerk Label</translation>
     </message>
@@ -13821,7 +14412,7 @@ Wil je het bericht bewaren?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Ond:</translation>
     </message>
@@ -13829,7 +14420,7 @@ Wil je het bericht bewaren?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Bericht</translation>
     </message>
@@ -13857,7 +14448,7 @@ Wil je het bericht bewaren?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Aanbevolen bestanden</translation>
     </message>
@@ -13867,37 +14458,37 @@ Wil je het bericht bewaren?</translation>
         <translation>Download alle Aanbevolen bestanden</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Onderwerp:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Van:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Aan:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Cc:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Bcc:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Labels:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Antwoord</translation>
     </message>
@@ -13937,7 +14528,7 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13989,7 +14580,7 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Bevestig %1 als vriend</translation>
     </message>
@@ -13999,12 +14590,12 @@ Wil je het bericht bewaren?</translation>
         <translation>Voeg %1 als vriend toe</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Geen onderwerp</translation>
     </message>
@@ -14014,22 +14605,17 @@ Wil je het bericht bewaren?</translation>
         <translation>Download</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14038,24 +14624,14 @@ Wil je het bericht bewaren?</translation>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Download alles</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Print Document</translation>
     </message>
@@ -14070,12 +14646,12 @@ Wil je het bericht bewaren?</translation>
         <translation>HTML- bestand (*.htm *.html );;Alle bestanden (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation> Afbeeldingen altijd laden voor dit bericht</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Het venster bijlage verbergen</translation>
     </message>
@@ -14097,6 +14673,42 @@ Wil je het bericht bewaren?</translation>
         <source>Compose</source>
         <translation>Opstellen</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Antwoord op geselecteerde bericht</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Antwoord</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Antwoord op alle geselecteerde berichten</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Beantwoord alles</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Stuur geselecteerd bericht door</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Doorsturen</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Verwijder geselecteerde bericht</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Verwijderen</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Print geselecteerd bericht</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14175,7 +14787,7 @@ Wil je het bericht bewaren?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Nieuw bericht</translation>
     </message>
@@ -14185,16 +14797,60 @@ Wil je het bericht bewaren?</translation>
         <translation>Opstellen</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Antwoord op geselecteerde bericht</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Antwoord</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Antwoord op alle geselecteerde berichten</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Beantwoord alles</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Stuur geselecteerd bericht door</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Doorsturen</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Verwijder geselecteerde bericht</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Verwijderen</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Print geselecteerd bericht</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Print</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Toon</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Labels</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Inbox</translation>
@@ -14224,17 +14880,21 @@ Wil je het bericht bewaren?</translation>
         <translation>Asbak</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Totaal inbox:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Mappen</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Snelle blik</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Print...</translation>
@@ -14244,6 +14904,26 @@ Wil je het bericht bewaren?</translation>
         <source>Print Preview</source>
         <translation>Print Voorbeeld</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Alleen knoppen tekst</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Knoppen tekst naast ikoon</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Knoppen met tekst</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Knoppen tekst onder ikoon</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">PLaats Tekst onder ikoon</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14265,7 +14945,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Stuur bericht door</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Onderwerp</translation>
     </message>
@@ -14275,7 +14955,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Van</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -14285,7 +14965,39 @@ Wil je het bericht bewaren?</translation>
         <translation>Inhoud</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Klik om op bijlages te sorteren</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Klik om op &quot;Onderwerp&quot; te sorteren</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Klik om op &quot;Gelezen&quot; te sorteren</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Klik om op &quot;Afzender&quot; te sorteren</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Klik om op &quot;Datum&quot; te sorteren</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Klik om op &quot;Labels&quot; te sorteren</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Klik om op &quot;Sterren&quot; te sorteren</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Stuur geselecteerd bericht door</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Zoek Onderwerp</translation>
     </message>
@@ -14294,11 +15006,6 @@ Wil je het bericht bewaren?</translation>
         <source>Search From</source>
         <translation>Zoek van</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14325,14 +15032,14 @@ Wil je het bericht bewaren?</translation>
         <translation>Zoek Bijlagen</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Starred</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14406,7 +15113,7 @@ Wil je het bericht bewaren?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14420,7 +15127,7 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14435,33 +15142,34 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Concepten</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Naar</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Geen &quot;Sterren&quot; berichten aanwezig. Sterren geven je bericht een speciale status zodat je de berichten makkelijker kan vinden. Om een bericht een ster te geven klik je op een lichte grijze ster naast een bericht.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Geen systeem berichten beschikbaar</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Naar</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Klik om te sorteren op</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14469,6 +15177,22 @@ Wil je het bericht bewaren?</translation>
         <source>Total:</source>
         <translation>Totaal:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Berichten</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Klik om te sorteren op tekening</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Dit bericht heeft een valide handtekening</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Dit bericht heeft een ongeldige handtekening</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14496,17 +15220,7 @@ Wil je het bericht bewaren?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14560,7 +15274,7 @@ Wil je het bericht bewaren?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -14570,7 +15284,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Item verwijderen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished">van</translation>
     </message>
@@ -14605,7 +15319,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Bericht in behandeling</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
@@ -14746,7 +15460,7 @@ Wil je het bericht bewaren?</translation>
         <translation>Verbindings ID</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Verwijder ongebruikte sleutels...</translation>
     </message>
@@ -14756,7 +15470,7 @@ Wil je het bericht bewaren?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Schoon sleutelring</translation>
     </message>
@@ -14774,13 +15488,7 @@ Opmerkingen: Je oude sleutelbos zal gebackupped worden.
 Deze operatie kan mislukken als er meerdere Retroshare instanties draaien op dezelfde machine.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Sleutelring info</translation>
@@ -14816,13 +15524,18 @@ Voor de veiligheid is je sleutelbos gebackupped.
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Datainconsistentie in de sleutelbos. Dit is hoogstwaarschijnlijk een bug. Neem contact op met de ontwikkelaars.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14832,18 +15545,25 @@ Voor de veiligheid is je sleutelbos gebackupped.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Netwerk</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14870,7 +15590,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14891,7 +15611,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Groepen</translation>
     </message>
@@ -14921,19 +15641,19 @@ Reported error:</source>
         <translation type="unfinished">importeer vriendenlijst, inclusief groepen</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14943,12 +15663,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14958,7 +15678,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Groep</translation>
     </message>
@@ -15073,7 +15793,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15083,7 +15803,7 @@ Reported error:</source>
         <translation type="unfinished">Wil je deze vriend verwijderen=</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Klaar!</translation>
@@ -15190,7 +15910,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15205,7 +15925,11 @@ at least one peer was not added to a group</source>
         <translation>Verwijder alles</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Dit is een test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15215,12 +15939,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15275,6 +15999,10 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Blogs</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Veiligheid</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15296,6 +16024,10 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Bericht</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Verbindings poging</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15449,6 +16181,10 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation>Alle Toasters tijdelijk uitschakelen</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Feed</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15458,7 +16194,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15478,12 +16214,12 @@ at least one peer was not added to a group</source>
         <translation>Foutief wachtwoord!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Ongeregistreerde plugin/executable</translation>
     </message>
@@ -15498,7 +16234,19 @@ at least one peer was not added to a group</source>
         <translation>Controleer uw systeem klok</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Onderzoek van gedeelde bestanden...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Indexeren van bestanden</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Bestands index opslaan...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15509,19 +16257,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Onbekende titel</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Versleutelde berichten</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15529,7 +16275,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Vriend online</translation>
     </message>
@@ -15581,6 +16327,10 @@ Laag verkeer: 10% standaard verkeerd en TODO: pauseerd alle bestands overdrachte
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Dialoog</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15671,12 +16421,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15685,6 +16430,10 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Onderteken PGP Sleutel</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15721,14 +16470,19 @@ p, li { white-space: pre-wrap; }
         <translation>Inclusief handtekeningen</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Opties</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Use as direct source, when available</source>
-        <translation type="unfinished">Gebruiken als directe bron, indien beschikbaar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -15767,21 +16521,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Error: kan geen verbindings gegevens vinden.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>De ingevoerde sleutel algoritme wordt niet ondersteund door RetroShare⏎
@@ -15800,7 +16554,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15869,6 +16623,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Misschien is uw wachtwoord fout</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15876,12 +16634,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15907,7 +16665,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
@@ -15928,7 +16686,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Item verwijderen</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
@@ -15968,7 +16726,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Schrijf een bericht</translation>
     </message>
@@ -15982,6 +16740,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Vriend verbonden</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Verbindings poging</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16020,13 +16782,17 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished">Onbekend</translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Onbekende Verbinding</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Verstuur bericht</translation>
     </message>
@@ -16193,6 +16959,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulier</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16200,11 +16973,23 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Foto</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Opmerkingen</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Overzicht</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16265,6 +17050,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Een opmerking toevoegen</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Schrijf een opmerking</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16335,6 +17128,10 @@ p, li { white-space: pre-wrap; }⏎
         <source>Create Album</source>
         <translation>Maak album</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Bekijk Album</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16356,17 +17153,17 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Slide Show</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Mijn Albums</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Geabonneerde Albums</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Gedeelde Albums</translation>
     </message>
@@ -16396,7 +17193,7 @@ voordat je het kunt bewerken!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Album Naam</translation>
     </message>
@@ -16455,19 +17252,19 @@ voordat je het kunt bewerken!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16503,12 +17300,12 @@ voordat je het kunt bewerken!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Tekst label</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Toon meer gegevens van deze plugin</translation>
     </message>
@@ -16654,6 +17451,41 @@ p, li { white-space: pre-wrap; }⏎
         <source>Plugin look-up directories</source>
         <translation>Plugin look-up directories</translation>
     </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Geen API nummer gevonden. Lees de plugin ontwerp handleiding.</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Geen SVN nummer gevonden. Lees de plugin ontwerp handleiding.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Laad error.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Er mist een symbool. Verkeerde versie?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Geen plugin object</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Plugin is geladen</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Onbekende status</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Controleer dit voor plugin ontwikkeling. Zij worden niet gecontroleerd voor de index. Echter, gewoonlijk zal het controleren van de index je beschermen tegen verdacht gebruik van de plugins</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16723,27 +17555,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Zet scherm boven</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16777,6 +17594,14 @@ p, li { white-space: pre-wrap; }⏎
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Het sluiten van dit venster zal het gesprek beëindigen en de chat-tunnel verwijderen.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Verwijder de tunnel?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16796,7 +17621,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Nieuw</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Stemmen van</translation>
     </message>
@@ -16816,8 +17641,8 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Opmerkingen</translation>
     </message>
@@ -16842,13 +17667,13 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16876,12 +17701,20 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Ondertekend door:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Notities</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16896,22 +17729,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Laad images bestand</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16927,17 +17750,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16947,7 +17760,23 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Bevestig Bericht</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">U verzendt een link. De sleutel tot een succesvolle indiening is interessante inhoud en een beschrijvende titel.</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Bevestig</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Een nieuw bericht verzenden</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Voeg een titel toe</translation>
     </message>
@@ -16967,22 +17796,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16997,7 +17816,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17008,7 +17827,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">PLaatje</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17018,7 +17837,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Titel</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Koppeling</translation>
     </message>
@@ -17026,12 +17845,36 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Geposte Links</translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Thema aanmaken</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Mijn Onderwerpen</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Geabonneerde Onderwerpen</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Populaire Onderwerpen</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Andere Onderwerpen</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17065,7 +17908,31 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Geplaatst Onderwerp</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Admins onderwerp toevoegen</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Selcteer Admins onderwerp</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Maak een nieuw onderwerp</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Onderwerp bewerken</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Bijwerken van onderwerp</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17103,17 +17970,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Tekst label</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>Abonneren op onderwerp</translation>
     </message>
@@ -17129,7 +17986,7 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -17144,17 +18001,24 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">Geplaatste beschrijving</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Laden</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">Nieuw geplaatst</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17167,18 +18031,22 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Site</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Opmerkingen</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
@@ -17189,12 +18057,12 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Opmerking</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17204,7 +18072,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17214,17 +18082,21 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Stemmen van</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Wegstemmen</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Markeer als gelezen en verplaats item</translation>
     </message>
@@ -17234,7 +18106,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17244,7 +18116,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
@@ -17285,10 +18157,73 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Laden</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Door</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulier</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Hot</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nieuw</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Boven</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Vandaag</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Gisteren</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Deze Week</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Deze Maand</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Dit Jaar</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Een nieuw bericht verzenden</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Volgend</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Maak of kies een teken-identiteit voor het stemmen</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Vorige</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17308,17 +18243,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17328,15 +18253,15 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">onbekend</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17346,42 +18271,42 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished">Tekst label</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17401,7 +18326,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Hot</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17431,17 +18356,17 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17456,17 +18381,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopieer RetroShare Link</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17476,31 +18396,27 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Bewerk</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17515,7 +18431,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Registreren</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17589,16 +18505,6 @@ p, li { white-space: pre-wrap; }⏎
         <source>No Channel Selected</source>
         <translation type="unfinished">Geen kanaal geselecteerd</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17607,6 +18513,10 @@ p, li { white-space: pre-wrap; }⏎
         <source>Tabs</source>
         <translation>Tabblad</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Elk onderwerp openen in een nieuw tabblad</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17620,6 +18530,10 @@ p, li { white-space: pre-wrap; }⏎
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Gepost</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17688,16 +18602,16 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Profiel Beheerder</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17809,7 +18723,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Bewerk berichten status</translation>
@@ -17825,7 +18739,7 @@ en daar de importeer functie gebruiken</translation>
         <translation>Profiel Beheerder</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Publieke informatie</translation>
     </message>
@@ -17860,12 +18774,12 @@ en daar de importeer functie gebruiken</translation>
         <translation>Online sinds:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Andere informatie</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Mijn adres</translation>
     </message>
@@ -17909,27 +18823,51 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Bericht van:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Account 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Account 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Account 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Voeg aan Pulse toe</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">filter</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">URL toevoeger</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Toon als</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17939,12 +18877,12 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished">Van:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17974,13 +18912,13 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17992,22 +18930,12 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18016,13 +18944,17 @@ en daar de importeer functie gebruiken</translation>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Post Pulse to Wire</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18037,24 +18969,34 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Laad images bestand</translation>
+        <source>From</source>
+        <translation type="vanished">Van</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Datum</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18065,7 +19007,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished">Formulier</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18084,7 +19026,7 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18094,7 +19036,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18121,7 +19063,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18131,7 +19073,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18151,7 +19093,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18267,7 +19209,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18275,42 +19217,37 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18342,7 +19279,7 @@ en daar de importeer functie gebruiken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18350,8 +19287,8 @@ en daar de importeer functie gebruiken</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Bevestiging</translation>
     </message>
@@ -18622,12 +19559,12 @@ Karakters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; worden vervangen
         <translation>Verbindings details</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Bestands aanvraag gestopt</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Deze versie van RetroShare maakt gebruik van OpenPGP-SDK. Als bijeffect gebruikt het niet de gedeelde PGP sleutelring maar heeft zijn eigen sleutelring die gebruikt wordt door alle RetroShare gevallen.&lt;br&gt;&lt;br&gt;</translation>
     </message>
@@ -18658,7 +19595,7 @@ Karakters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; worden vervangen
         <translation>Een onverwachte error verscheen. Stuur een report  &apos;RsInit::InitRetroShare onverwachte return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18692,7 +19629,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Meerdere gevallen</translation>
@@ -18715,26 +19652,6 @@ Lock file:⏎
 Lock file:⏎
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18815,7 +19732,7 @@ De error is: %2</translation>
         <translation>Gegevens doorsturen</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18825,7 +19742,7 @@ De error is: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18835,7 +19752,7 @@ De error is: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18851,7 +19768,7 @@ De error is: %2</translation>
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18918,7 +19835,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18946,7 +19863,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19126,29 +20043,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Naam</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Knooppunt</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19391,18 +20292,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19565,7 +20454,7 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Netwerk breed</translation>
     </message>
@@ -19745,7 +20634,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Het laden van ingesloten afbeeldingen is geblokkeerd.</translation>
     </message>
@@ -19758,7 +20647,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19931,22 +20820,12 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19954,12 +20833,12 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20651,7 +21530,7 @@ Als u denkt dat het is juist dat, de bijbehorende regel uit het bestand verwijde
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Naam</translation>
@@ -20772,7 +21651,7 @@ Als u denkt dat het is juist dat, de bijbehorende regel uit het bestand verwijde
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Naam</translation>
     </message>
@@ -20792,7 +21671,7 @@ Als u denkt dat het is juist dat, de bijbehorende regel uit het bestand verwijde
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20848,7 +21727,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20862,6 +21741,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Bericht ontbreekt ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20875,11 +21759,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Van</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished">Naar</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20902,18 +21781,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Klik om op &quot;Gelezen&quot; te sorteren</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Klik om op &quot;Afzender&quot; te sorteren</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20936,9 +21810,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20959,7 +21831,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Resets ALLE opgslagen RetroShare instellingen</translation>
     </message>
@@ -21020,7 +21892,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Stel RetroShare&apos;s taal in.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Het is niet mogelijk om het log bestand &apos;%1&apos;: %2 te openen</translation>
     </message>
@@ -21041,7 +21913,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Kan geen gegevensmap maken: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21071,7 +21943,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21089,7 +21961,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21106,12 +21978,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Plaats een sleutelwoord hier (minstens 3 karakters)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Start zoeken</translation>
     </message>
@@ -21173,7 +22045,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Leeg</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Sleutelwoorden</translation>
     </message>
@@ -21188,7 +22060,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Zoek ID</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Bestandsnaam</translation>
     </message>
@@ -21288,23 +22160,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Download geselecteerd</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Bestandsnaam</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopieer RetroShare Link</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Stuur RetroShare link</translation>
     </message>
@@ -21314,7 +22186,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Download</translation>
     </message>
@@ -21351,7 +22223,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Verwijder alles</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Map</translation>
@@ -21362,17 +22234,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Nieuwe RetroShare link(s)</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Open map</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Collectie maken...</translation>
     </message>
@@ -21392,7 +22264,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Download van collectief bestand...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Collectie</translation>
     </message>
@@ -21400,7 +22272,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Verbindings details</translation>
     </message>
@@ -21416,22 +22288,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Item verwijderen</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Verbindings ID:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Woonplaats:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21448,7 +22320,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21473,8 +22345,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21482,7 +22354,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>wil vrienden zijn met je op RetroShare</translation>
     </message>
@@ -21513,7 +22385,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Uitbreiden</translation>
     </message>
@@ -21558,12 +22430,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Schrijf een bericht</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Verbindings poging</translation>
     </message>
@@ -21583,22 +22455,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Onbekende (uitgaande) verbindings poging</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Onbekend veiligheids probleem</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">Onbekend</translation>
     </message>
@@ -21608,7 +22475,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Onbekenden verbinding</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Verberg</translation>
     </message>
@@ -21618,7 +22489,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Wil je deze vriend verwijderen=</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Certificaat heeft verkeerde handtekening! Deze verbinding is niet wie hij beweert te zijn.</translation>
     </message>
@@ -21628,12 +22499,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ontbrekende/Beschadigd certificaat. Niet een echte Retroshare gebruiker.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>Certificaat heeft een interne fout veroorzaakt.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21692,12 +22563,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Lokaal adres</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21718,22 +22589,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Poort:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Lokaal Netwerk</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Extern ip adres vinder</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Bekende / Eerdere IP&apos;s:</translation>
     </message>
@@ -21749,16 +22620,21 @@ kun je makkelijker verbonden worden met je vrienden. Het helpt⏎
 je ook als ja achter een Firewall of VPN zit.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Sta RetroShare toe om mijn ip-adres te vragen aan de volgende websites:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Aanvaardbare poorten variëren van 10 tot 65535. Normaal zijn poorten onder 1024 gereserveerd door uw systeem.</translation>
     </message>
@@ -21768,46 +22644,23 @@ je ook als ja achter een Firewall of VPN zit.</translation>
         <translation>Aanvaardbare poorten variëren van 10 tot 65535. Normaal zijn poorten onder 1024 gereserveerd door uw systeem.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>UI adres</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Discovery ingeschakeld (aanbevolen)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Ontdekking uit</translation>
     </message>
@@ -21817,7 +22670,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21842,95 +22695,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>Proxy lijkt te werken.</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21945,7 +22740,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished">onbekend</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21955,7 +22814,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21967,12 +22841,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21982,7 +22856,7 @@ Also check your ports!</source>
         <translation>Leeg</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21997,23 +22871,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22024,7 +22898,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22034,7 +22918,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22044,7 +22933,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22084,7 +22983,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
@@ -22099,7 +22998,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stop</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">Binnenkomend</translation>
     </message>
@@ -22135,32 +23039,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22215,7 +23094,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Totaal:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22240,7 +23119,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22252,7 +23131,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22275,7 +23154,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -22335,28 +23214,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22372,18 +23240,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22418,12 +23286,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22446,22 +23314,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22496,7 +23364,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22506,12 +23374,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22591,7 +23459,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Controleer welke verbinding je wilt delen met een openbare Privé Sleutel</translation>
     </message>
@@ -22601,12 +23469,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Delen voor vriend</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Deel</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>U kunt uw vrienden laten weten over uw kanaal door met hen te delen. 
@@ -22626,7 +23494,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Gedeelde mappen manager</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22646,17 +23514,17 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation type="unfinished">Zichtbaarheid</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Voeg een gedeelde directory toe</translation>
     </message>
@@ -22666,7 +23534,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Toepassen en sluiten</translation>
     </message>
@@ -22757,7 +23625,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>directory niet gevonden of directory naam niet geaccepteerd</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Dit is een lijst van gedeelde mappen. U kunt toevoegen en verwijderen van mappen met behulp van de knoppen aan de onderkant. Wanneer u een nieuwe map, aanvankelijk alle bestanden in die map worden gedeeld. U kunt delen vlaggen voor elke gedeelde map afzonderlijk instellen.</translation>
     </message>
@@ -22765,7 +23633,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Bestanden</translation>
     </message>
@@ -22816,16 +23684,11 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>controleer bestanden</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Download geselecteerd</translation>
     </message>
@@ -22835,7 +23698,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Download</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Kopieer Retroshare link naar het klembord</translation>
     </message>
@@ -22850,7 +23713,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Stuur RetroShare links</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22866,7 +23729,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Aanbeveling(en)</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Collectie maken...</translation>
     </message>
@@ -22891,7 +23754,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Download van collectief bestand...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23034,12 +23897,12 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Laad configuratie</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Maak interface</translation>
     </message>
@@ -23063,7 +23926,7 @@ Selecteer de vrienden waarmee u uw kanaal wilt delen.</translation>
         <translation>Onthoudt wachtwoord</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Log In</translation>
     </message>
@@ -23404,7 +24267,7 @@ This choice can be reverted in settings.</source>
         <translation>Berichten status</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Bericht:</translation>
     </message>
@@ -23649,7 +24512,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Verwijder alle labels</translation>
     </message>
@@ -23685,15 +24548,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished">Onbekend</translation>
     </message>
@@ -23703,13 +24563,18 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23719,57 +24584,12 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Niet verbonden</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23777,7 +24597,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23787,7 +24607,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23798,12 +24618,11 @@ p, li { white-space: pre-wrap; }⏎
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23831,7 +24650,7 @@ p, li { white-space: pre-wrap; }⏎
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Overdrachts opties</translation>
@@ -23842,7 +24661,7 @@ p, li { white-space: pre-wrap; }⏎
         <translation>Maximum gelijktijdige downloads:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23852,27 +24671,22 @@ p, li { white-space: pre-wrap; }⏎
         <translation type="unfinished">Deel automatisch uw opslag directory (Aanbevolen)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23957,7 +24771,7 @@ p, li { white-space: pre-wrap; }⏎
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23966,12 +24780,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23996,12 +24805,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Streaming</translation>
     </message>
@@ -24066,7 +24870,12 @@ p, li { white-space: pre-wrap; }
         <translation>Max. tunnel aanvraag. doorgestuurd per seconde:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24076,17 +24885,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Waarschuwing</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24114,7 +24913,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Download klaar</translation>
     </message>
@@ -24138,23 +24937,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Je hebt %1 complete downloads</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Je hebt %1 complete download</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 complete downloads</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 complete download</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Uploads</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Naam</translation>
@@ -24361,12 +25176,7 @@ p, li { white-space: pre-wrap; }
         <translation>Specificeer...</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Verplaats in Rij...</translation>
     </message>
@@ -24391,7 +25201,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kies directory</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24412,7 +25222,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24445,17 +25255,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bestand %1 is niet kompleet. Als het een media bestand is probeer deze te openen.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Waarschuwing</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Verander bestandsnaam</translation>
     </message>
@@ -24470,7 +25270,7 @@ p, li { white-space: pre-wrap; }
         <translation>Vul een nieuwe -en geldige- bestandsnaam in</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
@@ -24597,18 +25397,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Kolommen</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Bestandsoverdrachten</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Pad</translation>
     </message>
@@ -24618,7 +25423,7 @@ p, li { white-space: pre-wrap; }
         <translation>Pad kolom weergeven</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>Kan geen gegevens verwijderen voorvertoningsbestand</translation>
     </message>
@@ -24628,7 +25433,7 @@ p, li { white-space: pre-wrap; }
         <translation>Probeer het opnieuw?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Collectie maken..</translation>
     </message>
@@ -24643,7 +25448,7 @@ p, li { white-space: pre-wrap; }
         <translation>Bekijk collectie..</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Collectie</translation>
     </message>
@@ -24653,7 +25458,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Anonieme tunnel 0x</translation>
     </message>
@@ -24782,7 +25587,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-190"/>
         <location line="+19"/>
         <source>Unknown Peer</source>
-        <translation type="unfinished">Onbekenden verbinding</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -25067,17 +25872,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulier</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25117,27 +25917,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25147,12 +25937,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25289,7 +26079,11 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki pagina&apos;s</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Nieuwe Groep</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Pagina Naam</translation>
     </message>
@@ -25304,7 +26098,7 @@ p, li { white-space: pre-wrap; }
         <translation>Orig Id</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25392,7 +26186,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Pagina Bewerkte Geschiedenis</translation>
     </message>
@@ -25427,7 +26221,7 @@ p, li { white-space: pre-wrap; }
         <translation>PaginaID</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25457,18 +26251,14 @@ p, li { white-space: pre-wrap; }
         <translation>Labels</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Geschiedenis</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Toon Bewerkte Geschiedenis</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -25489,7 +26279,7 @@ p, li { white-space: pre-wrap; }
         <translation>Omkeren</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Bevestig</translation>
     </message>
@@ -25561,6 +26351,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">TimeRange</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25572,7 +26366,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Ververs</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25587,7 +26390,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Anderen</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25607,7 +26410,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25637,17 +26440,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Verleden Maand</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Verleden Week</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Vandaag</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nieuw</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">van</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">totdat</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Zoek/Filter</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Netwerk breed</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Beheer Accounts</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Toon:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Uzelf</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Vrienden</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Volgend</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Custom</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Account 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Account 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Account 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">CheckBox</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Post Pulse to Wire</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25710,42 +26581,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulier</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Verwijderen</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Woonplaats:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25790,41 +26654,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Volgend</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Onbekend</translation>
@@ -25902,7 +26736,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2d</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -25939,7 +26773,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_pl.ts b/retroshare-gui/src/lang/retroshare_pl.ts
index 637121e24..ef7478036 100644
--- a/retroshare-gui/src/lang/retroshare_pl.ts
+++ b/retroshare-gui/src/lang/retroshare_pl.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Dodaj komentarz</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: Wyszukiwanie zaawansowane</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Kryteria wyszukiwania</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Dodaj następne kryterium wyszukiwania.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Resetuj kryteria wyszukiwania.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Anuluj wyszukiwanie.</translation>
     </message>
@@ -157,6 +164,109 @@
         <translation>Szukaj</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Utwórz album</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Nazwa albumu:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Kategoria:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Zwierzęta</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Rodzina</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Przyjaciele</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Kwiaty</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Wakacje</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Zwierzęta</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Podróż</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Praca</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Losowe</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Gdzie:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotograf:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Opis</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Jakość:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Komentarze:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Publiczne</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Komentowanie zabronione</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Komentarze dozwolone</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Jakiekolwiek komentarze dozwolone</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Wstecz</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Dodaj zdjęcia</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Publikuj album</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Powiedz coś o tym albumie...</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -170,6 +280,10 @@
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Podsumowanie</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +299,26 @@
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Gdzie:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Kiedy</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Opis</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Komentarze</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Widoczność</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -549,7 +683,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -575,23 +709,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -634,7 +755,7 @@ p, li { white-space: pre-wrap; }
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -721,10 +842,22 @@ p, li { white-space: pre-wrap; }
         <translation>Zresetuj</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Prędkość pobierania</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Prędkość wysyłania</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Zawsze na wierzchu</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Styl</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -740,11 +873,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% nieprzezroczysty</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Zapisz</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Anuluj</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Od:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Ukryj ustawienia</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -817,7 +962,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -847,12 +992,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -860,7 +1005,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -880,7 +1025,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -918,7 +1063,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -938,7 +1083,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -968,7 +1113,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Przełącz status przeczytanej wiadomości</translation>
     </message>
@@ -978,7 +1123,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nowy</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -986,12 +1131,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1011,18 +1156,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Awatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Rozwiń</translation>
     </message>
@@ -1037,12 +1182,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Usuń element</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1211,17 +1356,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Kanały</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
@@ -1231,17 +1376,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Pobierania</translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1249,7 +1384,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1272,7 +1407,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1297,18 +1432,18 @@ into the image, so as to
         <translation type="unfinished">Awatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Rozwiń</translation>
     </message>
@@ -1323,7 +1458,7 @@ into the image, so as to
         <translation type="unfinished">Usuń element</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1333,7 +1468,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Ukryj</translation>
     </message>
@@ -1341,7 +1486,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1532,7 +1677,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Pokaż lobby rozmów</translation>
     </message>
@@ -1544,6 +1689,22 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Masz %1 nowych wiadomości</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Masz %1 nową wiadomość</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 nowych wiadomości</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 nowa wiadomość</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1565,14 +1726,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1580,13 +1740,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Liczba</translation>
     </message>
@@ -1596,7 +1756,29 @@ into the image, so as to
         <translation>Temat</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1606,7 +1788,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1663,12 +1845,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1678,31 +1860,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Stwórz lobby rozmów</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Nie podano tematu]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Informacje o zaznaczonym lobby</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Prywatny</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Publiczne</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1712,25 +1894,42 @@ Double click a chat room to enter and chat.</source>
         <translation>Wyłącz autosubskrypcję</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Dodaj autosubskrypcję</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Wyszukaj lobby rozmów</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Subskrybowane</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Kolumny</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Tak</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Nie</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1742,47 +1941,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1797,24 +1996,13 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Pokaż</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation type="unfinished"></translation>
@@ -1828,7 +2016,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Usuń element</translation>
     </message>
@@ -1873,7 +2061,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
@@ -1888,7 +2076,15 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Chat Settings</source>
+        <translation type="vanished">Ustawienia rozmów</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Włącz emotikony w rozmowach grupowych</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1908,7 +2104,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1933,7 +2129,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1942,6 +2138,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Chat Prywatny</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1963,7 +2163,11 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Czcionka w rozmowach</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Zmień czcionkę</translation>
     </message>
@@ -1973,10 +2177,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Czcionka w rozmowach:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Historia</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Styl</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1991,13 +2199,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Chat grupowy</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Chat prywatny</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2067,22 +2279,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">Szukaj</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2092,17 +2294,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2199,7 +2391,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Rozróżnianie wielkości liter</translation>
     </message>
@@ -2305,7 +2497,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Pokaż Chat</translation>
     </message>
@@ -2341,7 +2533,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -2376,12 +2568,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Pochylenie</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2461,6 +2653,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2498,7 +2695,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>pisze...</translation>
     </message>
@@ -2520,7 +2717,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Czy naprawdę chcesz fizycznie usunąć historię?</translation>
     </message>
@@ -2570,7 +2767,7 @@ after HTML conversion.</source>
         <translation>jest Zajęty i może nie odpowiedzieć</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2592,7 +2789,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2607,12 +2804,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2628,12 +2825,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2644,12 +2841,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2669,7 +2866,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2695,7 +2892,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Pokazywanie szczegółów:</translation>
     </message>
@@ -2717,7 +2914,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Kręgi Osobiste</translation>
     </message>
@@ -2743,7 +2940,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Przyjaciele</translation>
     </message>
@@ -2803,7 +3000,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2819,7 +3016,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Kręgi</translation>
     </message>
@@ -2871,45 +3068,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,7 +3116,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3001,17 +3198,12 @@ Double click on it to add his name on text writer.</source>
         <translation>brak</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3031,7 +3223,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3048,11 +3240,23 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Załącz podpisy</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Wyeksportuj swój certyfikat...</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Przeglądaj</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
@@ -3099,7 +3303,19 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">Email</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Zaproś Przyjaciół przez Email</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Wpisz adres email twoich przyjaciół (oddziel każdy średnikiem)</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Temat:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3115,32 +3331,36 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Email:</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Miejsce:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Dodaj przyjaciela do grupy:</translation>
     </message>
@@ -3150,7 +3370,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Uwierzytelnij znajomego (Podpisz Klucz PGP)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3175,22 +3395,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3210,27 +3420,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3276,17 +3491,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Ładowanie certyfikatu nie powiodło się</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Zaproszenie RetroShare</translation>
     </message>
@@ -3306,12 +3521,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3319,7 +3534,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3359,7 +3574,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3384,7 +3599,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3394,7 +3609,19 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Remove signatures</source>
+        <translation type="vanished">Usuń podpisy</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Możesz skopiować ten tekst i wysłać go do swojego przyjaciele poprzez email, czy też w inny sposób</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Zapisz jako...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3433,7 +3660,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3443,7 +3670,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3462,13 +3689,21 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Wiadomość:</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Do</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3481,7 +3716,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3516,7 +3751,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3526,7 +3761,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3591,7 +3831,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3619,7 +3859,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3629,20 +3869,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3652,14 +3889,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3669,8 +3904,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3695,7 +3929,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3987,7 +4221,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3995,8 +4229,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4006,7 +4239,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4042,12 +4275,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4067,7 +4300,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4087,18 +4320,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished">Ksywa</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4113,7 +4346,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Typ</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Nazwa:</translation>
     </message>
@@ -4153,19 +4394,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4175,24 +4416,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
@@ -4202,7 +4431,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Szukaj</translation>
@@ -4255,13 +4484,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">Utwórz</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4280,7 +4509,7 @@ p, li { white-space: pre-wrap; }
         <translation>Utwórz Grupę</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished">Nazwa grupy:</translation>
     </message>
@@ -4315,7 +4544,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4325,7 +4554,7 @@ p, li { white-space: pre-wrap; }
         <translation>Wiadomość</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4385,6 +4614,14 @@ p, li { white-space: pre-wrap; }
         <source>Add Channel Thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Wiadomość</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Temat:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4470,17 +4707,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4505,12 +4742,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4525,12 +4757,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4564,7 +4802,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4573,6 +4811,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Temat</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4593,8 +4835,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4613,7 +4855,7 @@ p, li { white-space: pre-wrap; }
         <translation>Możesz dołączyć pliki poprzez &quot;przeciągnij i upuść&quot; w tym oknie</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4643,17 +4885,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>W Odpowiedzi do</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Tytuł</translation>
     </message>
@@ -4706,7 +4948,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Wczytaj obraz</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4716,8 +4958,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4726,6 +4968,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Wyślij</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4740,7 +4986,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4775,7 +5021,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Utwórz</translation>
     </message>
@@ -4785,7 +5031,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4800,7 +5046,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4821,7 +5067,7 @@ Do you want to discard this message?</source>
         <translation>Kontakty:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4829,17 +5075,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Informacje Publiczne</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Miejsce:</translation>
     </message>
@@ -4849,12 +5095,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Online od:</translation>
     </message>
@@ -4874,7 +5120,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4884,7 +5135,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Inne Informacje</translation>
     </message>
@@ -4894,12 +5145,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Certyfikat</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4909,7 +5165,11 @@ Do you want to discard this message?</source>
         <translation>Załącz podpisy</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Zapisz Klucz do pliku</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Eksportuj Tożsamość</translation>
     </message>
@@ -4979,33 +5239,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5095,7 +5355,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5763,7 +6023,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5771,38 +6031,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>dd.MM.rrrr</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation> MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation> GB</translation>
     </message>
@@ -5810,12 +6070,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5977,7 +6237,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Obraz</translation>
     </message>
@@ -5987,7 +6247,7 @@ and use the import button to load it</source>
         <translation>Wideo</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6047,21 +6307,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Katalogi Przyjaciół</translation>
     </message>
@@ -6183,7 +6433,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6225,7 +6475,7 @@ and use the import button to load it</source>
         <translation>Pokaż Grupy</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
@@ -6261,7 +6511,7 @@ and use the import button to load it</source>
         <translation>Dodaj do grupy</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished">Szukaj</translation>
@@ -6277,7 +6527,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6514,7 +6764,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6552,7 +6802,7 @@ at least one peer was not added to a group</source>
         <translation>Szukaj Przyjaciół</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished">Zaznacz wszystkie</translation>
     </message>
@@ -6563,132 +6813,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6771,38 +6905,33 @@ Also check your ports!</source>
         <translation>Zresetuj czcionkę do domyślnej</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6820,17 +6949,7 @@ Also check your ports!</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6840,12 +6959,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6866,38 +6990,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6917,12 +7041,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6932,43 +7056,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7012,13 +7131,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7028,7 +7147,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7063,7 +7182,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7073,7 +7192,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7083,7 +7207,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7309,13 +7438,27 @@ and use the import button to load it</source>
         <translation>Pierwsze kroki</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Zaproś Przyjaciół</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7325,103 +7468,89 @@ and use the import button to load it</source>
         <translation>Dodaj Przyjaciół</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Zaawansowane: Otwórz Port Firewalla</translation>
-    </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Zaawansowane: Otwórz Port Firewalla</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Dalsza Pomoc i Wsparcie</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Otwórz stronę RS</translation>
     </message>
@@ -7446,7 +7575,7 @@ p, li { white-space: pre-wrap; }
         <translation>Opinia Email</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>Zaproszenie RetroShare</translation>
     </message>
@@ -7496,12 +7625,12 @@ p, li { white-space: pre-wrap; }
         <translation>Opinia o RetroShare</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>Wsparcie RetroShare</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7625,7 +7754,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Pokaż Chat Grupy</translation>
     </message>
@@ -7633,7 +7762,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7803,7 +7932,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Tytuł</translation>
     </message>
@@ -7816,12 +7945,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7846,7 +7975,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort by Name</source>
+        <translation type="vanished">Sortuj według Nazwy</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Sortuj według Popularności</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Sortuj według Ostatniego Postu</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7861,14 +8002,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Ostatni Post</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7879,13 +8020,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularność</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Wyświetl</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7898,7 +8043,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>i</translation>
     </message>
@@ -8034,7 +8179,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanały</translation>
@@ -8045,22 +8190,22 @@ p, li { white-space: pre-wrap; }
         <translation>Stwórz kanał</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Włącz auto-pobieranie</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Moje Kanały</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Subskrybowane kanały</translation>
     </message>
@@ -8080,12 +8225,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Wyłącz auto-pobieranie</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8120,22 +8265,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Odtwórz</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
@@ -8155,17 +8300,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8175,10 +8320,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formularz</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Rozmiar</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Tytuł</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Stan</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8216,19 +8380,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Zapisz się na kanał</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8242,7 +8396,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -8257,7 +8411,7 @@ p, li { white-space: pre-wrap; }
         <translation>Opis kanału</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Wczytywanie</translation>
     </message>
@@ -8272,9 +8426,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
+        <source>New Channel</source>
+        <translation type="vanished">Nowy kanał</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8285,7 +8438,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8306,7 +8459,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Odtwórz</translation>
     </message>
@@ -8362,24 +8515,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Pliki</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Uwaga! Masz mniej niż %1 godzin i %2 minut zanim ten plik zostanie skasowany. Rozważ jego zapisanie.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Skomentuj</translation>
     </message>
@@ -8394,17 +8551,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Wczytywanie</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8429,16 +8590,59 @@ p, li { white-space: pre-wrap; }
         <translation>Odtwórz multimedia</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Napisz post na kanale</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Wczytywanie</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Tytuł</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Szukaj Tytuł</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Wiadomość</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Nie wybrano kanału</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Wyłącz auto-pobieranie</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Włącz auto-pobieranie</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Pliki</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Opis</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Napisz post na kanale</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8508,7 +8712,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8544,7 +8748,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Komentarze</translation>
     </message>
@@ -8559,13 +8763,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8580,7 +8784,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8595,7 +8799,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8655,22 +8859,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8745,13 +8939,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Subskrybowane</translation>
     </message>
@@ -8802,17 +8995,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8927,7 +9120,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8940,7 +9133,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8970,7 +9163,7 @@ p, li { white-space: pre-wrap; }
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Komentarz</translation>
@@ -9009,7 +9202,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Odpowiedz na Komentarz</translation>
     </message>
@@ -9033,21 +9226,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Głosuj przeciw</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9057,7 +9235,7 @@ p, li { white-space: pre-wrap; }
         <translation>Skomentuj</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9086,10 +9264,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Komentarz&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9117,7 +9306,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9168,7 +9357,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Zasubskrybuj Forum</translation>
     </message>
@@ -9184,7 +9373,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -9204,9 +9393,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Wczytywanie</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9237,13 +9425,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Temat:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9254,7 +9442,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -9274,17 +9462,21 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Wczytywanie</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
@@ -9297,66 +9489,63 @@ before you can comment</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Rozpocznij nowy Wątek dla Wybranego Forum</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Przeszukaj fora</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Ostatni Post</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished">Nowy Wątek</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Widok Wątku</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Widok Płaski</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Tytuł</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Wczytywanie</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9366,7 +9555,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Odpowiedz Wiadomością</translation>
     </message>
@@ -9390,6 +9584,10 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Pobierz wszystkie pliki</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Następne nieprzeczytane</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9406,23 +9604,31 @@ before you can comment</source>
         <translation>Szukaj Autora</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Zawartość</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Szukaj Zawartości</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Bez nazwy</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Odpowiedz</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9465,12 +9671,16 @@ before you can comment</source>
         <translation>Skopiuj Link RetroShare</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Rozwiń</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9500,8 +9710,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9515,6 +9725,22 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anonimowy</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">podpisane</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">brak</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Brakująca Wiadomość ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9584,12 +9810,12 @@ before you can comment</source>
         <translation>Oryginalna Wiadomość</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">Edytuj</translation>
     </message>
@@ -9650,7 +9876,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9670,7 +9896,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9722,7 +9948,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9732,7 +9958,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9747,7 +9973,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9813,12 +10039,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Fora</translation>
@@ -9849,16 +10075,31 @@ This message is missing. You should receive it later.</source>
         <translation>Inne Fora</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Oczekiwanie</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Wczytywanie</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Dodaj Ikonę</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9869,12 +10110,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Dystrybucja Wiadomości</translation>
     </message>
@@ -9882,7 +10123,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Publiczne</translation>
     </message>
@@ -9901,6 +10142,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Nowy Wątek</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Wymagane</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Zaszyfrowane Wiadomości</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9942,7 +10191,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished">Komentarze:</translation>
     </message>
@@ -9965,7 +10214,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9981,12 +10230,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10003,23 +10252,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10035,28 +10284,22 @@ This message is missing. You should receive it later.</source>
         <translation>Proszę, dodaj Nazwę</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Załaduj Logo Grupy</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10066,12 +10309,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10081,7 +10324,7 @@ This message is missing. You should receive it later.</source>
         <translation>Ostatni Post</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10156,12 +10399,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Popularność</translation>
     </message>
@@ -10177,22 +10415,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Utwórz</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Autor</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10200,7 +10443,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Wczytywanie</translation>
     </message>
@@ -10260,7 +10503,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10317,12 +10560,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Skopiuj Link RetroShare</translation>
     </message>
@@ -10345,7 +10588,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10358,14 +10601,18 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Wczytywanie</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10375,7 +10622,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10385,12 +10632,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10410,14 +10652,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10429,7 +10663,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10477,13 +10711,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Wczytywanie</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10864,7 +11102,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10880,7 +11118,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Autorzy</translation>
     </message>
@@ -10899,7 +11137,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10977,7 +11215,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formularz</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10987,7 +11225,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11015,7 +11253,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11025,7 +11263,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11035,7 +11273,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11055,37 +11293,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11097,12 +11311,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11117,7 +11331,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished">Zapisz jako...</translation>
     </message>
@@ -11382,14 +11601,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Wszyscy</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Reputacja</translation>
     </message>
@@ -11399,12 +11618,12 @@ p, li { white-space: pre-wrap; }
         <translation>Szukaj</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Stwórz nową Tożsamość</translation>
     </message>
@@ -11414,7 +11633,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11429,27 +11648,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished">Zamknij</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11465,39 +11684,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Kręgi</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11517,20 +11726,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Kręgi Osobiste</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11540,78 +11747,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11622,17 +11829,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anonim</translation>
     </message>
@@ -11647,24 +11854,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11679,12 +11886,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11694,7 +11896,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11769,7 +11971,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11799,7 +12001,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">nieznane</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11814,7 +12016,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11862,7 +12064,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11870,7 +12072,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11913,7 +12115,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11993,7 +12195,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12009,12 +12211,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12119,7 +12326,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12169,21 +12376,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12193,7 +12400,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12208,7 +12415,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12223,12 +12430,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12248,12 +12455,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12263,7 +12470,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12271,7 +12478,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Ksywa</translation>
     </message>
@@ -12301,13 +12508,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudonim</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12321,7 +12522,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12331,12 +12532,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12347,27 +12543,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12387,7 +12583,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12397,18 +12593,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12418,7 +12608,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12428,7 +12623,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12438,15 +12633,10 @@ These identities will soon be not supported anymore.</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Usuń</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12472,7 +12662,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Dodaj</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Utwórz</translation>
     </message>
@@ -12482,13 +12672,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12498,7 +12688,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12572,7 +12762,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Skopiuj</translation>
     </message>
@@ -12582,12 +12772,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Zaznacz wszystkie</translation>
     </message>
@@ -12606,38 +12796,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Cytat</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Wyślij</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12655,32 +12833,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12701,12 +12874,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12715,31 +12883,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Otwórz Plik</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Otwórz folder</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Sprawdzanie...</translation>
     </message>
@@ -12749,7 +12912,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12777,7 +12940,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Dodaj Przyjaciela</translation>
     </message>
@@ -12793,8 +12956,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
@@ -12815,7 +12977,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Zamknij</translation>
     </message>
@@ -12826,12 +12988,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Kreator szybkiego startu</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 bezpieczna, zdecentralizowana platforma komunikacji</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Niedokończone</translation>
     </message>
@@ -12856,12 +13018,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Stan</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Powiadom</translation>
     </message>
@@ -12872,35 +13033,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Aplikacje</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Minimalizuj</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Maksymalizuj</translation>
     </message>
@@ -12915,12 +13072,7 @@ These identities will soon be not supported anymore.</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 nowa wiadomość</translation>
     </message>
@@ -12950,7 +13102,7 @@ These identities will soon be not supported anymore.</source>
         <translation>%1 przyjaciół połączonych</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Czy naprawczę chcesz wyjść z RetroShare ?</translation>
     </message>
@@ -12970,7 +13122,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pokaż</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13015,13 +13167,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13036,7 +13187,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13045,17 +13196,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Paragraf</translation>
     </message>
@@ -13091,12 +13242,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Zwiększ rozmiar czcionki</translation>
     </message>
@@ -13111,32 +13262,32 @@ These identities will soon be not supported anymore.</source>
         <translation>Pogrubienie</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Pochylenie</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Wyrównanie</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Dodaj Obraz</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Podkreślenie</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Temat:</translation>
     </message>
@@ -13147,32 +13298,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Polecane pliki</translation>
     </message>
@@ -13242,7 +13393,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Wyślij do:</translation>
     </message>
@@ -13282,7 +13433,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13302,18 +13453,18 @@ These identities will soon be not supported anymore.</source>
         <translation>chce być twoim przyjacielem na RetroShare</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Zapisz wiadomość</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Wiadomość nie została wysłana.
@@ -13325,17 +13476,7 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Wklej Link RetroShare</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Dodaj do &quot;Do&quot;</translation>
     </message>
@@ -13355,7 +13496,7 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Dodaj jako Polecane</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Oryginalna Wiadomość</translation>
     </message>
@@ -13365,21 +13506,21 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Od</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Do</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Wysłane</translation>
     </message>
@@ -13394,7 +13535,7 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Re:</translation>
     </message>
@@ -13404,30 +13545,30 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Fwd:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Czy chcesz wysłać tą wiadomość bez tematu ?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Proszę dodaj przynajmniej jednego odbiorcę.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Nieznane</translation>
     </message>
@@ -13542,13 +13683,13 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation type="unfinished">Szczegóły</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Otwórz Plik...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>Pliki HTML (*.htm *.html);;Wszystkie pliki (*)</translation>
     </message>
@@ -13568,7 +13709,7 @@ Czy chcesz zapisać wiadomość do wersji roboczych?</translation>
         <translation>Eksport PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Wiadomość nie została wysłana.
@@ -13590,7 +13731,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Dodaj dodatkowy plik</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13620,18 +13761,18 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Od klatki:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13671,13 +13812,13 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13687,12 +13828,12 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13770,7 +13911,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Domyślne</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Nowa karta</translation>
     </message>
@@ -13780,7 +13921,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Nowe okno</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Edytuj Tag</translation>
     </message>
@@ -13803,7 +13944,7 @@ Czy chcesz zapisać wiadomość ?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13811,7 +13952,7 @@ Czy chcesz zapisać wiadomość ?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Wiadomość</translation>
     </message>
@@ -13839,7 +13980,7 @@ Czy chcesz zapisać wiadomość ?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Rekomendowane Pliki</translation>
     </message>
@@ -13849,37 +13990,37 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Pobierz wszystkie Polecane Pliki</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Temat:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Od klatki:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Do klatki:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Tagi:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Odpowiedz</translation>
     </message>
@@ -13919,7 +14060,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13971,7 +14112,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Zatwierdź %1 jako przyjaciela</translation>
     </message>
@@ -13981,12 +14122,12 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Dodaj %1 jako przyjaciela</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Brak tematu</translation>
     </message>
@@ -13996,22 +14137,17 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14020,24 +14156,14 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Pobierz wszystkie</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Drukuj Dokument</translation>
     </message>
@@ -14052,12 +14178,12 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Pliki HTML (*.htm *.html);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14079,6 +14205,34 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Odpowiedz na wybraną wiadomość</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Odpowiedz</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Odpowiedz na wszystkie wybrane wiadomości</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Prześlij dalej wybraną wiadomość</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Usuń wybraną wiadomość</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Usuń</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Drukuj wybraną wiadomość</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14157,7 +14311,7 @@ Czy chcesz zapisać wiadomość ?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Nowa Wiadmość</translation>
     </message>
@@ -14167,16 +14321,52 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Odpowiedz na wybraną wiadomość</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Odpowiedz</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Odpowiedz na wszystkie wybrane wiadomości</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Prześlij dalej wybraną wiadomość</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Usuń wybraną wiadomość</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Usuń</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Drukuj wybraną wiadomość</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Drukuj</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Wyświetl</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Przychodzące</translation>
@@ -14206,17 +14396,21 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Kosz</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Foldery</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Szybki podgląd</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Drukuj...</translation>
@@ -14226,6 +14420,26 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>Print Preview</source>
         <translation>Podgląd Wydruku</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Tylko ikony przycisków</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Tekst obok przycisków ikon</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Przyciski z tekstem</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Tekst przycisków pod ikonami</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Ustaw tekst pod ikoną</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14247,7 +14461,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Tytuł</translation>
     </message>
@@ -14257,7 +14471,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Od</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
@@ -14267,7 +14481,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Zawartość</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14276,11 +14490,6 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14307,7 +14516,17 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Szukaj Załączników</translation>
     </message>
     <message>
-        <location line="+324"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
+        <source>Starred</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>System</source>
         <translation type="unfinished">System</translation>
     </message>
@@ -14377,7 +14596,12 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+20"/>
+        <source>Show author in People</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+43"/>
         <source>Empty trash</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14387,7 +14611,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14402,48 +14626,22 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
         <source>To</source>
-        <translation>Do</translation>
+        <translation type="vanished">Do</translation>
     </message>
     <message>
-        <location line="+69"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+249"/>
-        <source>Starred</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+256"/>
-        <source>Show in People</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+586"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14451,6 +14649,10 @@ Czy chcesz zapisać wiadomość ?</translation>
         <source>Total:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Wiadomości</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14478,17 +14680,7 @@ Czy chcesz zapisać wiadomość ?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14542,7 +14734,7 @@ Czy chcesz zapisać wiadomość ?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -14552,7 +14744,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation>Usuń element</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished">od</translation>
     </message>
@@ -14587,7 +14779,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
@@ -14728,7 +14920,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Usuń nieużywane klucze...</translation>
     </message>
@@ -14738,7 +14930,7 @@ Czy chcesz zapisać wiadomość ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14752,13 +14944,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14791,13 +14977,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14807,12 +14998,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14845,7 +15036,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14866,7 +15057,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Grupy</translation>
     </message>
@@ -14896,19 +15087,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">Szukaj</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14918,12 +15109,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14933,7 +15124,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Grupa</translation>
     </message>
@@ -15048,7 +15239,7 @@ Reported error:</source>
         <translation type="unfinished">Zwiń wszystkie</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15058,7 +15249,7 @@ Reported error:</source>
         <translation type="unfinished">Czy chcesz usunąć tego Przyjaciela?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15165,7 +15356,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15180,7 +15371,11 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">To jest test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15190,12 +15385,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15250,6 +15445,10 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Blogi</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Bezpieczeństwo</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15327,7 +15526,7 @@ at least one peer was not added to a group</source>
     <message>
         <location line="+7"/>
         <source>Private Chat</source>
-        <translation type="unfinished">Prywatny Chat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
@@ -15433,7 +15632,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15453,12 +15652,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15473,7 +15672,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Test</translation>
     </message>
@@ -15484,19 +15683,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15504,7 +15701,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15643,12 +15840,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15657,6 +15849,10 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Podpisz klucz PGP</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15693,7 +15889,12 @@ p, li { white-space: pre-wrap; }
         <translation>Załącz podpisy</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Opcje</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15739,21 +15940,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15771,7 +15972,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15840,6 +16041,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Być może hasło jest błędne</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15847,12 +16052,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15878,7 +16083,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
@@ -15899,7 +16104,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Usuń element</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
@@ -15939,7 +16144,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Napisz wiadomość</translation>
     </message>
@@ -15997,7 +16202,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16164,6 +16369,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formularz</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16171,11 +16383,23 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Zdjęcie</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Komentarz</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Podsumowanie</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16236,6 +16460,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Dodaj Komentarz</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Napisz komentarz...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16302,6 +16534,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Utwórz Album</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Pokaż Album</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16323,17 +16559,17 @@ p, li { white-space: pre-wrap; }
         <translation>Pokaz Slajdów</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Moje Albumy</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Subskrybowane Albumy</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16362,7 +16598,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16421,19 +16657,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16469,12 +16705,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Pokaż więcej szczegółów o tej wtyczce</translation>
     </message>
@@ -16689,27 +16925,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16762,7 +16983,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nowy</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16782,8 +17003,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Komentarze</translation>
     </message>
@@ -16808,13 +17029,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16842,12 +17063,16 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Notes</source>
+        <translation type="vanished">Notki</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16862,22 +17087,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Wczytaj obraz</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16893,17 +17108,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16913,7 +17118,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16933,22 +17138,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16963,7 +17158,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16974,7 +17169,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Obraz</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16984,7 +17179,7 @@ p, li { white-space: pre-wrap; }
         <translation>Tytuł</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16992,12 +17187,28 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>My Topics</source>
+        <translation type="vanished">Moje Tematy</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Subskrybowane Tematy</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Popularne Tematy</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Inne Tematy</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17031,7 +17242,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17069,17 +17280,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17095,7 +17296,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -17110,17 +17311,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Loading</source>
+        <translation type="vanished">Wczytywanie</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17133,18 +17333,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Strona</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation type="unfinished">Komentarze</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17155,12 +17359,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Skomentuj</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17170,7 +17374,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17180,17 +17384,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17200,7 +17408,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nowy</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17210,7 +17418,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17251,11 +17459,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Wczytywanie</translation>
     </message>
 </context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formularz</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nowy</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Dzisiaj</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Wczoraj</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Następne</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Poprzednie</translation>
+    </message>
+</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17274,17 +17513,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17294,15 +17523,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">nieznane</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17312,42 +17541,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17367,7 +17596,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Szukaj</translation>
     </message>
@@ -17397,17 +17626,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17422,17 +17651,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17442,31 +17666,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Edytuj</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17481,7 +17701,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Zapisz się</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17555,16 +17775,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Nie wybrano kanału</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17654,16 +17864,16 @@ p, li { white-space: pre-wrap; }
         <translation>Menedżer profili</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17771,7 +17981,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17787,7 +17997,7 @@ and use the import button to load it</source>
         <translation>Menedżer profili</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Informacje Publiczne</translation>
     </message>
@@ -17822,12 +18032,12 @@ and use the import button to load it</source>
         <translation>Online od:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Inne Informacje</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Mój Adres</translation>
     </message>
@@ -17871,27 +18081,43 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Account 1</source>
+        <translation type="vanished">Konto 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Konto 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Konto 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">filtr</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Wyświetl Jako</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17901,12 +18127,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Od klatki:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17936,13 +18162,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17954,22 +18180,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17984,7 +18200,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17999,24 +18215,34 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Wczytaj obraz</translation>
+        <source>From</source>
+        <translation type="vanished">Od</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Data</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18027,7 +18253,7 @@ and use the import button to load it</source>
         <translation type="unfinished">Formularz</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18046,7 +18272,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18056,7 +18282,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18083,7 +18309,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18093,7 +18319,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18113,7 +18339,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18229,7 +18455,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18237,42 +18463,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18304,7 +18525,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18312,8 +18533,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18582,12 +18803,12 @@ Symbole &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; zostaną zastąpio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18618,7 +18839,7 @@ Symbole &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; zostaną zastąpio
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18652,7 +18873,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18671,26 +18892,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18770,7 +18971,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18780,7 +18981,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18790,7 +18991,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18806,7 +19007,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18873,7 +19074,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18901,7 +19102,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19081,29 +19282,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19346,18 +19531,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19502,7 +19675,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19669,7 +19842,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19682,7 +19855,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19855,22 +20028,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19878,12 +20041,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20573,7 +20736,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20694,7 +20857,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20714,7 +20877,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20770,7 +20933,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20784,6 +20947,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Brakująca Wiadomość ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20797,11 +20965,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Od</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished">Do</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20824,17 +20987,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20858,9 +21016,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20881,7 +21037,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20942,7 +21098,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20963,7 +21119,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20993,7 +21149,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21011,7 +21167,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21028,12 +21184,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21094,7 +21250,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21109,7 +21265,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21209,23 +21365,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Nazwa pliku</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Pobierz</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Skopiuj link RetroShare</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21235,7 +21391,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Pobierz</translation>
     </message>
@@ -21272,7 +21428,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Folder</translation>
@@ -21283,17 +21439,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Otwórz folder</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21313,7 +21469,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21321,7 +21477,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21337,22 +21493,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Usuń element</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Miejsce:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21369,7 +21525,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21394,8 +21550,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21403,7 +21559,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>chce być przyjacielem z tobą na RetroShare</translation>
     </message>
@@ -21434,7 +21590,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Rozwiń</translation>
     </message>
@@ -21479,12 +21635,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Napisz wiadomość</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21504,12 +21660,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">Nieznane</translation>
     </message>
@@ -21519,17 +21680,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
@@ -21539,7 +21690,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Czy chcesz usunąć tego Przyjaciela?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21549,12 +21700,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21613,12 +21764,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Adres Lokalny</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21639,22 +21790,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21667,16 +21818,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21686,46 +21842,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21735,7 +21868,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21760,95 +21893,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21863,7 +21938,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished">nieznane</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21873,7 +22012,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21885,12 +22039,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21900,7 +22054,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21915,23 +22069,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21942,7 +22096,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21952,7 +22116,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21962,7 +22131,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22002,7 +22181,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
@@ -22017,7 +22196,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stop</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">Przychodzące</translation>
     </message>
@@ -22053,32 +22237,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22133,7 +22292,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22158,7 +22317,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22170,7 +22329,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22193,7 +22352,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Stan</translation>
     </message>
@@ -22253,28 +22412,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22290,18 +22438,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22336,12 +22484,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22364,22 +22512,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22414,7 +22562,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22424,12 +22572,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22509,7 +22657,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22519,12 +22667,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Podziel się z przyjacielem</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22543,7 +22691,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22563,17 +22711,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished">Widoczność</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22583,7 +22731,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Zastosuj i zamknij</translation>
     </message>
@@ -22674,7 +22822,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22682,7 +22830,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Pliki</translation>
     </message>
@@ -22733,16 +22881,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22752,7 +22895,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22767,7 +22910,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22783,7 +22926,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22808,7 +22951,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22951,12 +23094,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22980,7 +23123,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23319,7 +23462,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Wiadomość:</translation>
     </message>
@@ -23560,7 +23703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Usuń wszystkie tagi</translation>
     </message>
@@ -23596,15 +23739,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished">Nieznane</translation>
     </message>
@@ -23614,13 +23754,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23630,57 +23775,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Błąd</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23688,7 +23788,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23698,7 +23798,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23709,12 +23809,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23742,7 +23841,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Opcje transferu</translation>
@@ -23753,7 +23852,7 @@ p, li { white-space: pre-wrap; }
         <translation>Maksymalna ilość jednoczesnych pobierań:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23763,27 +23862,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23868,7 +23962,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23877,12 +23971,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23907,12 +23996,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23977,7 +24061,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23987,17 +24076,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Ostrzeżenie</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24025,7 +24104,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Pobieranie zakończone</translation>
     </message>
@@ -24049,23 +24128,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Masz %1 zakończonych pobierań</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Masz %1 zakończone pobieranie</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 zakończonych pobierań</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 zakończone pobieranie</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Pobierania</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Nazwa</translation>
@@ -24272,12 +24367,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24302,7 +24392,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24323,7 +24413,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24356,17 +24446,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Ostrzeżenie</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24381,7 +24461,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Rozwiń wszystkie</translation>
@@ -24508,18 +24588,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Kolumny</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Transfery plików</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Ścieżka</translation>
     </message>
@@ -24529,7 +24614,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24539,7 +24624,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24554,7 +24639,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24564,7 +24649,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24978,17 +25063,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formularz</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25028,27 +25108,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25058,12 +25128,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25200,7 +25270,11 @@ p, li { white-space: pre-wrap; }
         <translation>Strony Wiki</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Nowa Grupa</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25215,7 +25289,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25303,7 +25377,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Historia Edycji Strony</translation>
     </message>
@@ -25338,7 +25412,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25368,18 +25442,14 @@ p, li { white-space: pre-wrap; }
         <translation>Tagi</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Historia</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Pokaż Historię Edycji</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -25400,7 +25470,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25483,7 +25553,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Odśwież</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25498,7 +25577,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Inni</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25518,7 +25597,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25548,17 +25627,57 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Ostatni miesiąc</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Ostatni tydzień</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Dziś</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nowy</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">od</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Zarządzaj Kontami</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Przyjaciele</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Następujące</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Account 1</source>
+        <translation type="vanished">Konto 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Konto 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Konto 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25621,42 +25740,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formularz</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Usuń</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Miejsce:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25701,41 +25813,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Następujące</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Nieznane</translation>
@@ -25813,7 +25895,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25850,7 +25932,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_pt.ts b/retroshare-gui/src/lang/retroshare_pt.ts
index 842fde2d7..4835855cf 100644
--- a/retroshare-gui/src/lang/retroshare_pt.ts
+++ b/retroshare-gui/src/lang/retroshare_pt.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -540,7 +540,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,23 +566,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -625,7 +612,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,7 +699,7 @@ p, li { white-space: pre-wrap; }
         <translation>Repor</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -808,7 +795,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,12 +825,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -851,7 +838,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -871,7 +858,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -909,7 +896,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -929,7 +916,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -959,7 +946,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -969,7 +956,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -977,12 +964,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1002,18 +989,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1028,12 +1015,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1202,17 +1189,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1222,17 +1209,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1217,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1263,7 +1240,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1288,18 +1265,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1314,7 +1291,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1324,7 +1301,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1332,7 +1319,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1523,7 +1510,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1556,14 +1543,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1571,13 +1557,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,7 +1573,29 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,7 +1605,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1654,12 +1662,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1669,42 +1677,23 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-564"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1714,22 +1703,27 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1744,47 +1738,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1799,7 +1793,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Mostrar</translation>
@@ -1819,7 +1813,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1864,7 +1858,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1879,7 +1873,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1899,7 +1893,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1924,7 +1918,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1954,7 +1948,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1964,7 +1958,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +1982,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,22 +2052,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,17 +2067,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2190,7 +2164,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Sensível capitalização</translation>
     </message>
@@ -2296,7 +2270,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2332,7 +2306,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2367,12 +2341,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,6 +2426,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2489,7 +2468,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2511,7 +2490,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2561,7 +2540,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2583,7 +2562,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2598,12 +2577,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2619,12 +2598,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2635,12 +2614,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2660,7 +2639,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,7 +2665,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2708,7 +2687,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2734,7 +2713,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2794,7 +2773,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2810,7 +2789,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2862,45 +2841,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2910,7 +2889,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2992,17 +2971,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3022,7 +2996,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3090,7 +3064,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3106,12 +3080,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -3121,17 +3095,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,7 +3115,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,22 +3140,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3201,27 +3165,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3267,17 +3236,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3297,12 +3266,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3310,7 +3279,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3350,7 +3319,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3375,7 +3344,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3385,7 +3354,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3424,7 +3393,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3434,7 +3403,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3459,7 +3428,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3472,7 +3441,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3507,7 +3476,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3517,7 +3486,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3582,7 +3556,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3610,7 +3584,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3620,20 +3594,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3643,14 +3614,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3660,8 +3629,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3686,7 +3654,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3978,7 +3946,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3986,8 +3954,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3997,7 +3964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4033,12 +4000,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4058,7 +4025,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4078,18 +4045,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4104,7 +4071,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
@@ -4144,19 +4111,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4166,24 +4133,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
@@ -4193,7 +4148,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4246,13 +4201,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,7 +4226,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4306,7 +4261,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4316,7 +4271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4461,17 +4416,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4496,12 +4451,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4516,12 +4466,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +4511,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,16 +4521,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+44"/>
+        <location line="+75"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4589,7 +4536,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+21"/>
+        <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 Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+93"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4604,7 +4560,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4634,17 +4590,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4697,7 +4653,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4707,8 +4663,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4731,7 +4687,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4766,7 +4722,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4776,7 +4732,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4791,7 +4747,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4812,7 +4768,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4820,17 +4776,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,12 +4796,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4821,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4875,7 +4836,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,12 +4846,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4866,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4970,33 +4936,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5086,7 +5052,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5754,7 +5720,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5762,38 +5728,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5801,12 +5767,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5968,7 +5934,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5978,7 +5944,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6038,21 +6004,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6174,7 +6130,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6216,7 +6172,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6252,7 +6208,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6268,7 +6224,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6505,7 +6461,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6543,7 +6499,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6554,132 +6510,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6762,38 +6602,33 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6811,17 +6646,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6831,12 +6656,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6857,38 +6687,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6908,12 +6738,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6923,43 +6753,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7003,13 +6828,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7019,7 +6844,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7054,7 +6879,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7064,7 +6889,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7074,7 +6904,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7300,13 +7135,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7316,57 +7165,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7374,45 +7205,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7437,7 +7272,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7487,12 +7322,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7616,7 +7451,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7624,7 +7459,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7794,7 +7629,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7807,12 +7642,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7837,7 +7672,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7852,14 +7687,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7870,13 +7705,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7889,7 +7724,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8025,7 +7860,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8036,22 +7871,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8071,12 +7906,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8111,22 +7946,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8146,17 +7981,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8169,7 +8004,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8207,18 +8042,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8233,7 +8058,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8248,7 +8073,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8262,11 +8087,6 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8276,7 +8096,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8297,7 +8117,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8359,18 +8179,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8385,17 +8205,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8423,13 +8243,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8499,7 +8319,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8535,7 +8355,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8550,13 +8370,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8571,7 +8391,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8586,7 +8406,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8646,22 +8466,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8736,13 +8546,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8793,17 +8602,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8918,7 +8727,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8931,7 +8740,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8961,7 +8770,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -9000,7 +8809,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9024,21 +8833,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9048,7 +8842,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9077,7 +8871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9108,7 +8902,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9159,7 +8953,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9175,7 +8969,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9194,11 +8988,6 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9228,13 +9017,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9245,7 +9034,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9265,17 +9054,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9288,66 +9077,59 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9357,7 +9139,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9397,23 +9184,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9456,12 +9243,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9491,8 +9278,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9575,12 +9362,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9641,7 +9428,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9661,7 +9448,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9713,7 +9500,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9723,7 +9510,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9738,7 +9525,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9804,12 +9591,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9844,12 +9631,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9860,12 +9647,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9873,7 +9660,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9933,7 +9720,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9956,7 +9743,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,12 +9759,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,23 +9781,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10026,28 +9813,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10057,12 +9838,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10072,7 +9853,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,12 +9928,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10168,22 +9944,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10191,7 +9972,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10251,7 +10032,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10308,12 +10089,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10336,7 +10117,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10349,14 +10130,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10366,7 +10147,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10376,12 +10157,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,14 +10177,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10420,7 +10188,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10468,7 +10236,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10855,7 +10623,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10871,7 +10639,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10890,7 +10658,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10964,7 +10732,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10974,7 +10742,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +10770,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11012,7 +10780,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11022,7 +10790,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11042,37 +10810,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11084,12 +10828,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11104,7 +10848,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11369,14 +11118,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11386,12 +11135,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11401,7 +11150,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11416,27 +11165,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11452,39 +11201,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11504,20 +11243,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11527,78 +11264,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11609,17 +11346,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11634,24 +11371,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11666,12 +11403,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11681,7 +11413,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11756,7 +11488,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11786,7 +11518,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11801,7 +11533,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11849,7 +11581,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11857,7 +11589,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11900,7 +11632,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11980,7 +11712,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11996,12 +11728,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12106,7 +11843,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12156,21 +11893,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12180,7 +11917,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12195,7 +11932,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12210,12 +11947,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12235,12 +11972,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12250,7 +11987,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12258,7 +11995,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12288,13 +12025,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12308,7 +12039,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12318,12 +12049,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12334,27 +12060,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12374,7 +12100,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12384,18 +12110,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12405,7 +12125,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12415,7 +12140,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,15 +12150,10 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12459,7 +12179,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Adicionar</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,13 +12189,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12485,7 +12205,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12559,7 +12279,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
@@ -12569,12 +12289,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12597,34 +12317,18 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12642,32 +12346,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12688,12 +12387,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12702,31 +12396,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12736,7 +12425,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12764,7 +12453,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12780,8 +12469,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
@@ -12802,7 +12490,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12813,12 +12501,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12843,12 +12531,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12859,35 +12546,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12902,12 +12585,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12937,7 +12615,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12957,7 +12635,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13002,13 +12680,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13023,7 +12700,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13032,17 +12709,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13078,12 +12755,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13098,32 +12775,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13134,32 +12811,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13229,7 +12906,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13269,7 +12946,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13289,18 +12966,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13311,17 +12988,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13341,7 +13008,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13351,21 +13018,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13380,7 +13047,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13390,30 +13057,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13528,13 +13195,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13554,7 +13221,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13575,7 +13242,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13605,18 +13272,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13656,13 +13323,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13672,12 +13339,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13755,7 +13422,7 @@ Do you want to save message ?</source>
         <translation>Omissão</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13765,7 +13432,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13788,7 +13455,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13796,7 +13463,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13824,7 +13491,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13834,37 +13501,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>De:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Para:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13904,7 +13571,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13956,7 +13623,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13966,12 +13633,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13981,22 +13648,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14005,24 +13667,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14037,12 +13689,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14064,6 +13716,10 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Apagar</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14142,7 +13798,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14152,16 +13808,20 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Delete</source>
+        <translation type="vanished">Apagar</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14191,17 +13851,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14232,7 +13892,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14242,7 +13902,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14252,7 +13912,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14261,16 +13921,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14297,12 +13947,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14378,7 +14028,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14392,7 +14042,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14407,28 +14057,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14463,17 +14103,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14527,7 +14157,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14537,7 +14167,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14572,7 +14202,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14713,7 +14343,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14723,7 +14353,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14737,13 +14367,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14776,13 +14400,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14792,12 +14421,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14830,7 +14459,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14851,7 +14480,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14881,19 +14510,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14903,12 +14532,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14918,7 +14547,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15033,7 +14662,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15043,7 +14672,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15150,7 +14779,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15165,7 +14794,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15175,12 +14804,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15418,7 +15047,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15438,12 +15067,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15458,7 +15087,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15469,19 +15098,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15489,7 +15116,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15628,12 +15255,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15678,7 +15300,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Opções</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15724,21 +15351,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15756,7 +15383,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15832,12 +15459,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15863,7 +15490,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15884,7 +15511,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -15924,7 +15551,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15982,7 +15609,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16300,17 +15927,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16339,7 +15966,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16398,19 +16025,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16446,12 +16073,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16662,27 +16289,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16735,7 +16347,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16755,8 +16367,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16781,13 +16393,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16815,12 +16427,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16835,22 +16447,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16866,17 +16468,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16886,7 +16478,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16906,22 +16498,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16936,7 +16518,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16947,7 +16529,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16957,7 +16539,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16965,12 +16547,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17004,7 +16586,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17042,17 +16624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17068,7 +16640,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17083,17 +16655,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17106,18 +16673,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17128,12 +16695,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17143,7 +16710,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17153,17 +16720,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17173,7 +16740,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17183,7 +16750,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17224,7 +16791,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17247,17 +16814,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17267,15 +16824,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17285,42 +16842,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17340,7 +16897,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17370,17 +16927,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17395,17 +16952,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17415,31 +16967,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17454,7 +17002,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17528,16 +17076,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17627,16 +17165,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17744,7 +17282,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17760,7 +17298,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17795,12 +17333,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17844,27 +17382,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17874,12 +17412,12 @@ and use the import button to load it</source>
         <translation type="unfinished">De:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17909,13 +17447,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17927,22 +17465,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17957,7 +17485,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17972,25 +17500,20 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PulseMessage</name>
@@ -18000,7 +17523,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18019,7 +17542,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18029,7 +17552,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18056,7 +17579,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18066,7 +17589,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18086,7 +17609,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18202,7 +17725,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18210,42 +17733,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18277,7 +17795,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18285,8 +17803,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18554,12 +18072,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18590,7 +18108,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18624,7 +18142,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18643,26 +18161,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18742,7 +18240,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18752,7 +18250,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18762,7 +18260,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18778,7 +18276,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18845,7 +18343,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18873,7 +18371,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19053,29 +18551,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19318,18 +18800,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19469,7 +18939,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19636,7 +19106,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19649,7 +19119,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19822,22 +19292,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19845,12 +19305,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20538,7 +19998,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20659,7 +20119,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20679,7 +20139,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20735,7 +20195,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20749,6 +20209,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20762,11 +20227,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20789,17 +20249,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20823,9 +20278,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20846,7 +20299,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20907,7 +20360,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20928,7 +20381,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20958,7 +20411,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20976,7 +20429,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20993,12 +20446,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21059,7 +20512,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21074,7 +20527,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21174,23 +20627,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,7 +20653,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21237,7 +20690,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -21248,17 +20701,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21278,7 +20731,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21286,7 +20739,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21302,22 +20755,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21334,7 +20787,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21359,8 +20812,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21368,7 +20821,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21399,7 +20852,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21444,12 +20897,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21469,12 +20922,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21484,17 +20942,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21504,7 +20952,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21514,12 +20962,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21578,12 +21026,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21604,22 +21052,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21632,16 +21080,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21651,46 +21104,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21700,7 +21130,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21725,95 +21155,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21828,7 +21200,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21838,7 +21274,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21850,12 +21301,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21865,7 +21316,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21880,23 +21331,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21907,7 +21358,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21917,7 +21378,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21927,7 +21393,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21967,7 +21443,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21982,7 +21458,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22018,32 +21499,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22098,7 +21554,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22123,7 +21579,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22135,7 +21591,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22158,7 +21614,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22218,28 +21674,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22255,18 +21700,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22301,12 +21746,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22329,22 +21774,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22379,7 +21824,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22389,12 +21834,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22474,7 +21919,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22484,12 +21929,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22508,7 +21953,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22528,17 +21973,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22548,7 +21993,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22639,7 +22084,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22647,7 +22092,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22698,16 +22143,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22717,7 +22157,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22732,7 +22172,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22748,7 +22188,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22773,7 +22213,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22916,12 +22356,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22945,7 +22385,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23284,7 +22724,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23521,7 +22961,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23557,15 +22997,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23575,13 +23012,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23591,57 +23033,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23649,7 +23046,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23659,7 +23056,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23670,12 +23067,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23703,7 +23099,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23714,7 +23110,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23724,27 +23120,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23829,7 +23220,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23838,12 +23229,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23868,12 +23254,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23938,7 +23319,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23948,17 +23334,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23986,7 +23362,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24014,19 +23390,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -24233,12 +23609,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24263,7 +23634,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24284,7 +23655,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24317,17 +23688,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24342,7 +23703,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24469,18 +23830,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Caminho</translation>
     </message>
@@ -24490,7 +23856,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24500,7 +23866,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24515,7 +23881,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24525,7 +23891,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24939,17 +24305,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24989,27 +24350,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25019,12 +24370,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25161,7 +24512,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25176,7 +24527,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25264,7 +24615,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25299,7 +24650,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25329,18 +24680,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25361,7 +24708,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25444,7 +24791,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25459,7 +24811,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25479,7 +24831,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25509,7 +24861,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25519,7 +24871,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25582,42 +24934,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25662,41 +25007,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25774,7 +25089,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25811,7 +25126,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_ru.qm b/retroshare-gui/src/lang/retroshare_ru.qm
index cfa22ad5c..c60f6f497 100644
Binary files a/retroshare-gui/src/lang/retroshare_ru.qm and b/retroshare-gui/src/lang/retroshare_ru.qm differ
diff --git a/retroshare-gui/src/lang/retroshare_ru.ts b/retroshare-gui/src/lang/retroshare_ru.ts
index 20b2f9e16..cfe0de745 100644
--- a/retroshare-gui/src/lang/retroshare_ru.ts
+++ b/retroshare-gui/src/lang/retroshare_ru.ts
@@ -84,6 +84,13 @@
         <translation>Только скрытый узел сети</translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Добавить комментарий</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: расширенный поиск</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Критерии поиска</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Добавить дополнительный критерий поиска.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Сбросить критерии поиска.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Отменяет поиск.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Поиск </translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Создать альбом</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Название альбома</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Категория:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Дикие животные</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Семья</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Узлы сети</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Цветы</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Праздник</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Пейзажи</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Домашние животные</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Портреты</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Путешествия</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Работа</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Случайно</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Заголовок:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Где:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Фотограф:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Описание:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Настройки общего доступа</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Политика:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Качество:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Комментарии:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Личность:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Публичный</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Ограниченный</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Изменение размера изображений (&lt; 1 МБ)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Изменение размера изображений (&lt; 10 МБ)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Отправить исходные изображения</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Комментарии запрещены</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Авторизованные комментарии</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Любые комментарии разрешены</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Опубликовать под псевдонимом</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Перетащите картинку для вставки. Нажмите на картинку для редактирования подробностей.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Назад</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Добавить фото</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Опубликовать альбом</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Удалить название альбома</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Сделать отклик об альбоме...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Источник контента</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Загрузить миниатюру альбома</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Альбом</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Миниатюра альбома</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Резюме</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>Надпись</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Где:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Когда</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Описание:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Настройки общего доступа</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Комментарии</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Опубликовать личность</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Видимость</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Предупреждение: это экспериментальные сервисы. Пожалуйста, помогите нам протестировать их.
@@ -569,6 +783,14 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>Круги</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">Форумы Gxs</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">Каналы Gxs</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ p, li { white-space: pre-wrap; }
         <translation>Фотографии</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">Сохранить изображение</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p кБ</translation>
     </message>
@@ -633,13 +842,17 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Добавить аватар</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Удалить эту позицию</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Установить ваш аватар</translation>
     </message>
@@ -658,6 +871,10 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Загрузить аватар</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ p, li { white-space: pre-wrap; }
         <translation>Сброс</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Скорость приёма</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Скорость отдачи</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Поверх всех окон</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Стиль</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% непрозрачности</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Сохранить</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Отмена</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>С:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Скрыть настройки</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,7 +1063,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Комментарий</translation>
     </message>
@@ -852,12 +1093,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Автор этого сообщения (личность %1) заблокирован.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Голосовать &quot;за&quot;</translation>
     </message>
@@ -885,7 +1126,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Голосовать &quot;за&quot;</translation>
     </message>
@@ -943,7 +1184,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Предоставить общий доступ</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Изменить статус прочитанного сообщения</translation>
     </message>
@@ -983,7 +1224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Новый</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
@@ -991,12 +1232,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Мне нравится</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Аватар</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1042,12 +1283,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Удалить объект</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,17 +1457,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Каналы</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Общее</translation>
     </message>
@@ -1236,17 +1477,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Обмен файлами</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Загрузить сообщения в фоне (потоком)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Открывать каждый канал в новой вкладке</translation>
     </message>
@@ -1254,7 +1489,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1512,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Мне нравится</translation>
     </message>
@@ -1302,18 +1537,18 @@ into the image, so as to
         <translation type="unfinished">Аватар</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1328,7 +1563,7 @@ into the image, so as to
         <translation type="unfinished">Удалить объект</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
@@ -1338,7 +1573,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Комментарий</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished">Комментарии </translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1346,7 +1591,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
@@ -1527,18 +1772,18 @@ into the image, so as to
     <message>
         <location line="+75"/>
         <source>Redock to Main window</source>
-        <translation>Перезакрепить в главном окне</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Undock to a new window</source>
-        <translation>Открепить в новом окне</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Показать чат-комнату</translation>
     </message>
@@ -1550,6 +1795,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>Чаты</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">У вас %1 новых сообщений</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">У вас %1 новых сообщений</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 новых сообщений</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 новое сообщение</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1571,14 +1832,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Неизвестная чат-комната</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Удалить всё</translation>
     </message>
@@ -1586,13 +1846,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Всего</translation>
     </message>
@@ -1602,7 +1862,33 @@ into the image, so as to
         <translation>Тема</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>Подписанные приватные чат-комнаты</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>Подписанные публичные чат-комнаты</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Приватные чат-комнаты</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Публичные чат-комнаты</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;Чат-комнаты&lt;/h1&gt; &lt;p&gt;Чат-комнаты это распределенная система чатов для общения, которые функционируют по довольно схожим с IRC принципам. Чаты позволяют анонимно общаться с множеством людей без необходимости добавлять их в список своих контактов.&lt;/p&gt;                    	                      &lt;p&gt;Чат-комнаты могут быть публичным (участники из списка ваших контактов видят их) или приватным (участники из списка ваших контактов не видят их до тех пор, пока они не получат ваше приглашение присоединиться к чату. &lt; img src=&quot;:/images/add_24x24.png «width=%2/ &gt;). 	                      В случае, когда в приватную чат-комнату были приглашены вы, она становится вам видима. Но это только в том случае, когда один или несколько ваших доверенных узлов используют её. &lt;/p&gt;                                                                                               	                      &lt;p&gt;Список слева показывает чат-комнаты, в которых находится один или несколько участников из вашего окружения. Вы можете &lt;ul&gt;&lt;li&gt;щёлкнуть правой кнопкой мыши для создания новой чат-комнаты&lt;/li&gt;, &lt;li&gt;дважды щёлкнуть по существующей чат-комнате, чтобы войти в неё, общаться и показать её своим друзьям.&lt;/li&gt;&lt;/ul&gt; Примечание: Для правильной работы чат-комнат, время вашего компьютера должно быть установлено точно.  Поэтому проверьте ваши системные часы!	                      &lt;/p&gt;                                      	                      </translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Создать чат-комнату</translation>
     </message>
@@ -1612,7 +1898,7 @@ into the image, so as to
         <translation>Покинуть эту чат-комнату</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>Создать неанонимную личность и войти в чат-комнату</translation>
     </message>
@@ -1671,12 +1957,12 @@ Double click a chat room to enter and chat.</source>
 Двойной щелчок мыши для входа в комнату и общения.</translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 приглашает вас в чат-комнату %2</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Выберите неанонимную личность для этой чат-комнаты:</translation>
     </message>
@@ -1686,31 +1972,31 @@ Double click a chat room to enter and chat.</source>
         <translation>Выберите личность, от имени которой вы будете общаться чат-комнате:</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Создать чат-комнату</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[тема не указана]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Информация о выбранной чат-комнате</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>приватная</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>публичная</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>Допустимы анонимные участники</translation>
     </message>
@@ -1720,25 +2006,42 @@ Double click a chat room to enter and chat.</source>
         <translation>Удалить автоподписку</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Установить автоподписку</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Поиск чатов</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Поиск по имени</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Подписка</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Столбцы</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Нет</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1750,47 +2053,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Название чат-комнаты: </translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>Идентификатор чат-комнаты: </translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Безопасность:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Участников:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
@@ -1805,24 +2108,13 @@ Double click a chat room to enter and chat.</source>
         <translation>Анонимные участники не допускаются</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>столбец</translation>
@@ -1836,7 +2128,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Удалить объект</translation>
     </message>
@@ -1881,22 +2173,46 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Главное</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Удалённый чат</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Все</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Контакты</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Никто</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Разрешить удалённый шифрованный чат от</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Настройки чата</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Разрешить смайлики в приватном чате</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Разрешить смайлики в групповом чате</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Разрешить пользовательские шрифты</translation>
     </message>
@@ -1905,6 +2221,10 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>Разрешить нестандартный размер шрифта</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">Минимальный размер шрифта</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1916,7 +2236,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1941,7 +2261,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Загружать внедрённые изображения</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Чат-комната</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Мерцание иконки вкладки</translation>
     </message>
@@ -1950,6 +2274,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation>Не отсылать уведомления о наборе текста</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Приватный чат</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1971,7 +2299,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Мерцание иконки окна/вкладки</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Шрифт чата</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Изменить шрифт чата</translation>
     </message>
@@ -1981,10 +2313,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Шрифт чата:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>История</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Стиль</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1999,13 +2335,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation>Вариант:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Групповой чат</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Приватный чат</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation>Выберите свой шрифт по умолчанию для чата.</translation>
     </message>
@@ -2069,28 +2409,22 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;В этой вкладке вы можете задать, какое количество сообщений чата RetroShare будет хранить на диске, а также объём отображения состоявшихся бесед для различных систем чатов. Максимальный период хранения позволяет очищать историю чатов и предотвращает её заполнение временными чатами (например, обычные чаты или удалённые чаты).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Комнаты чата</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Включено:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2100,17 +2434,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Чат-комнаты</translation>
@@ -2207,7 +2531,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Максимальный срок хранения, в днях (0 - бесконечно):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Параметры поиска по умолчанию</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Учитывать регистр</translation>
     </message>
@@ -2246,6 +2574,10 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation>Порог автоматического поиска</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Личность по умолчанию для чат-комнат:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2313,7 +2645,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Показать чат</translation>
     </message>
@@ -2349,7 +2681,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -2384,12 +2716,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>Вставить смайлик</translation>
     </message>
@@ -2398,6 +2730,10 @@ Double click a chat room to enter and chat.</source>
         <source>Attach a Picture</source>
         <translation>Прикрепить картинку</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton: деактивирована {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2469,6 +2805,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation>Вставить горизонтальную черту</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Сохранить изображение</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2506,7 +2847,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>печатает...</translation>
     </message>
@@ -2530,7 +2871,7 @@ after HTML conversion.</source>
         <translation>Выберите шрифт.</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Вы действительно хотите удалить с диска историю сообщений?</translation>
     </message>
@@ -2580,7 +2921,7 @@ after HTML conversion.</source>
         <translation>сейчас занят и не может вам ответить</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>Найти с учётом регистра</translation>
     </message>
@@ -2602,7 +2943,7 @@ after HTML conversion.</source>
         <translation>Продолжить выделять цветом после X найденных вхождений (требуется больше ресурсов процессора)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Найти предыдущее &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2617,12 +2958,16 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;Найти&lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Состояние)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Указать тип шрифта и цвет текста</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Прикрепить файл</translation>
     </message>
@@ -2638,12 +2983,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Отметить этот выделенный текст&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl + M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation>Идентификатор личности: </translation>
     </message>
@@ -2654,12 +2999,12 @@ Double click on it to add his name on text writer.</source>
         <translation>Двойной щелчок, чтобы добавить имя в текстовый редактор.</translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation> Не подписано</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation> удовлетворяют условию.</translation>
     </message>
@@ -2679,7 +3024,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Печатайте ваши сообщения здесь</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Продолжить выделять цветом после</translation>
     </message>
@@ -2705,7 +3050,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Подробности: </translation>
     </message>
@@ -2727,7 +3072,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Личные круги</translation>
     </message>
@@ -2753,7 +3098,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Узлы сети</translation>
     </message>
@@ -2813,7 +3158,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Ближнее окружение</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Внешние круги (администратор) </translation>
     </message>
@@ -2829,7 +3174,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Круги</translation>
     </message>
@@ -2881,48 +3226,43 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Ошибка: не могу получить совокупность деталей.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2934,7 +3274,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Шифрование</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>не соединён</translation>
     </message>
@@ -3016,17 +3356,25 @@ Double click on it to add his name on text writer.</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Этот сертификат содержит:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;&lt;b&gt;идентификатор узла&lt;/b&gt; и &lt;b&gt;имя&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">&lt;b&gt;onion-адрес&lt;/b&gt; и &lt;b&gt;порт&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">&lt;b&gt;IP-адрес&lt;/b&gt; и &lt;b&gt;порт&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы можете использовать этот сертификат, чтобы пополнить список ваших контактов. Отправьте его потенциальному участнику по электронной почте или передайте лично в руки.&lt;/p&gt;</translation>
     </message>
@@ -3041,7 +3389,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Это метод шифрования, используемый &lt;span style=&quot;font-weight:600;&quot;&gt; OpenSSL&lt;/span&gt;. Подключение к доверенному узлу&lt;/p&gt; &lt;p&gt;всегда шифруется стойким алгоритмом и если DHE присутствует, дальнейшее соединение использует метод&lt;/p&gt; &lt;p&gt;«совершенной секретности с упреждением».&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation> с </translation>
     </message>
@@ -3058,16 +3406,118 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Помощник подключения к удалённому узлу</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Добавить новый узел</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Вы получаете сертификат доверенного узла</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;Добавить в личное окружение контакты моих доверенных узлов</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Email 
+ (Your friend will receive an email with instructions how to download RetroShare)</source>
+        <translation type="vanished">&amp;Отправить приглашение по электронной почте
+(ваш контакт получит письмо с инструкциями, откуда скачать RetroShare)</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Вставить подписи</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Скопировать ваш сертификат в буфер обмена</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Сохранить ваш сертификат в файл</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Запустить почтовый клиент</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Открыть сертификат вашего контакта из файла</translation>
     </message>
+    <message>
+        <source>Open certificate</source>
+        <translation type="vanished">Открыть сертификат</translation>
+    </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">Пожалуйста, вставьте сертификат другого участника сети в поле внизу</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Файлы сертификатов</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Использовать PGP-сертификаты, сохранённые в файлах.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Импортировать сертификат доверенного узла</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Вам следует создать файл с вашим сертификатом и передать его потенциальному участнику сети. Также вы можете использовать файл созданный заранее.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Экспортировать мой сертификат</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Перетащите файл с сертификатом другого участника сети в это окно или укажите путь к нему в поле ниже</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Обзор</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Ближнее окружение</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Выберите с кем вы хотите обменяться сертификатами.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Показать мне:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Обменяться сертификатами с этими участниками</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>Идентификатор RetroShare</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Использовать идентификатор RetroShare для обмена сертификатами с существующим узлом сети.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Добавить RetroShare ID других участников...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Вставить RetroShare ID других участников в поле ниже</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Введите RetroShare ID участника сети. Например, Peer@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3109,7 +3559,27 @@ Double click on it to add his name on text writer.</source>
         <translation>Электронная почта</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Пригласить потенциального участника сети по электронной почте</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Введите адреса электронных почт потенциальных участников сети (адреса разделять запятыми)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Адреса электронной почты:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Введите адреса электронных почт потенциальных участников сети</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Тема:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3125,32 +3595,77 @@ Double click on it to add his name on text writer.</source>
         <translation>Подробности запроса</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Сведения об участнике</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Эл. почта</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Узел сети:</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">Обратите внимание на тот факт, что вы можете добавлять в ваше окружение столько контактов, сколько пожелаете. Но их количество более 40, вероятно, приведёт к заметной загрузке CPU, памяти и пропускной способности вашего интернет-канала.</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">Этот мастер поможет вам соединиться с другими участниками сети RetroShare (тёмной сети).&lt;br&gt;Для этого доступны следующие способы:</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Ввести сертификат вручную</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">Ввести личность RetroShare вручную</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">&amp;Отправить приглашение через провайдеров веб-почты.</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Рекомендовать друг другу несколько контактов из окружения</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">Сертификат RetroShare </translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">Пожалуйста, вставьте сертификат другого участника сети в поле внизу</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Вставить сертификат</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Сюда следует вводить сертификаты потенциальных контактов. ВНИМАНИЕ: сертификаты — это не просто пбличные PGP-ключи, это более сложная структура данных. Не вставляйте сюда PGP-ключи своих потенциальных контактов (ни полностью, ни частично) – это не сработает. Сертификат должен вводиться полностью!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Добавить этот узел в группу:</translation>
     </message>
@@ -3160,7 +3675,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Аутентификация доверенного узла (подписать его PGP-ключ)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3185,22 +3700,16 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Добавить сертификат участника для последующего соединения с ним</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Чтобы принять запрос на предложение обменяться сертификатами, нажмите кнопку «Завершить».</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>К сожалению, появились некоторые ошибки</translation>
     </message>
@@ -3220,27 +3729,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Подробная информация об узле:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Уровень доверия к ключу:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Подписавшие</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Подписание публичного ключа участника сети – это способ обозначить своё доверие тому или иному участнику. Сигнатуры, которые вы видите ниже, подтверждают, что ключи в списке заверены и признаются как подлинные.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Этот участник уже находится в вашем доверенном окружении. Добавление сертификата снова лишь установит актуальный IP-адрес этого узла.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3286,17 +3800,49 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Ошибка загрузки сертификата</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Не удаётся получить подробности PGP-ключа участника %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Любой участник, ключ которого не подписан мною</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Участники из окружения, которые подписали мой сертификат</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Подписанные участники показывать как отвергнутые</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Имя участника</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Также подписано</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Идентификатор участника</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">Сертификат в порядке</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Недействительный сертификат RetroShare!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>Приглашение в RetroShare</translation>
     </message>
@@ -3316,12 +3862,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Это же ваш собственный сертификат! Вы не хотели бы соединиться с самим собой, не так ли?</translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3329,7 +3875,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation>Этот ключ уже находится в вашем доверенном списке</translation>
     </message>
@@ -3369,7 +3915,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>У вас имеется запрос на соединение от</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3394,7 +3940,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3404,7 +3950,47 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Ошибка загрузки сертификата: %1 не найден</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">Этот участник %1 не доступен в вашей сети</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Использовать новый формат сертификата (безопаснее)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Использовать старый формат сертификата (совместим со старыми версиями)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Удаление подписи</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">Приглашение в RetroShare</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Помощь по установлению соединения</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Вы можете скопировать этот текст и отправить его контрагенту по электронной почте или любым другим способом</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Ваш сертификат скопирован в буфер обмена. Отправьте контрагенту письмо с этим сертификатом по электронной почте или же воспользуйтесь любым другим доступным способом.</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Сохранить как...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3443,7 +4029,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Никого ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Использовать как прямой источник, при возможности</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>IP-адрес:</translation>
     </message>
@@ -3453,7 +4043,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP-адрес:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Показать дополнительные настройки</translation>
     </message>
@@ -3462,6 +4052,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Механизм подписания ключей может оказаться полезным другим участникам сети, которые, добавляя чужой сертификат в своё окружение, имеют возможность посмотреть, кто подписал ключ в сертификате. Следует отметить, что подписание чужих ключей не является обязательным и не может быть впоследствии отменено. Поэтому подходите к вопросу подписания, взвесив все «за» и «против».&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare периодически проверяет папки ваших контактов, доступные вам к просмотру, на предмет наличия там интересующего вас файла. Если файл находится, в целях скачивания с контактом устанавливается прямое соединение – не через систему анонимных туннелей. В этом случае узел-источник из вашего окружения достоверно знает, что файл качаете именно вы – пользователь с конкретным сертификатом.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Чтобы исключить такого рода небезопасное поведение вашего клиент-сервера, снимите здесь галочку. Отметим, что прямое соединение всё равно установится, если вы напрямую выберете в открытой к просмотру папке файл для скачивания. Включение/отключение возможности прямого соединения при файлообмене применяется ко всем местоположениям одного узла.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3472,13 +4066,45 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Участники тёмной сети, для которых активирована эта опция, не смогут установить с вами соединение, если их IP-адрес не внесён в белый список. Подобный подход защищает вас от атаки типа «перенаправление трафика». Когда опция включена, блокируемые участники будут получать сообщения через &quot;уведомления системы безопасности&quot;. Здесь вы имеете возможность занести определённые IP-адреса в белый/чёрный список. Применяется ко всем местоположениям, привязанным к конкретному сертификату.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Рекомендовать друг друга множеству участников сети</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Рекомендации одних участников сети другим участникам</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">Нижеследующий текст – это ваш сертификат RetroShare. Для установления соединения вам следует передать его действующему участнику тёмной сети.</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Сообщение:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Рекомендовать участников</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Кому</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Выберите по меньшей мере одного участника для того, чтобы порекомендовать его</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Выберите по меньшей мере одного участника на роль получателя рекомендации</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Добавить ключ в связку ключей</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Это ключ уже в вашей связке</translation>
     </message>
@@ -3494,7 +4120,7 @@ even if you don&apos;t make friends.</source>
 даже если вы не являетесь доверенными.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Сертификат имеет неправильный номер версии. Помните, что  сети v0.6 и v0.5 несовместимы.</translation>
     </message>
@@ -3529,7 +4155,7 @@ even if you don&apos;t make friends.</source>
         <translation>Добавить IP в белый список </translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>В этом сертификате отсутствует IP-адрес!</translation>
     </message>
@@ -3539,10 +4165,27 @@ even if you don&apos;t make friends.</source>
         <translation>Этот сертификат не содержит в себе IP-адреса. В данном случае для установления соединения с узлом ваш клиент задействует сервис обнаружения и распределённую таблицу хешей DHT. Поскольку вам требуется разрешение белого списка, подключение к участнику вызовет предупреждение системы безопасности во вкладке новостей. Оттуда вы можете добавить его IP-адрес в белый список.</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Добавлено с сертификатом от %1</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Вставить сертификат участника из буфера обмена</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Ошибка загрузки сертификата: не удаётся прочитать файл %1 </translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Ошибка загрузки сертификата: что-то не так с %1 </translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3604,7 +4247,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>Установление UDP</translation>
     </message>
@@ -3640,7 +4283,7 @@ 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;Lucida Grande&apos;; font-size:13pt;&quot;&gt;то можете закрыть его.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Помощник соединения</translation>
     </message>
@@ -3650,20 +4293,17 @@ p, li { white-space: pre-wrap; }
         <translation>Неверный идентификатор участника</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Неизвестное состояние</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Не в сети</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>За симметричным NAT</translation>
     </message>
@@ -3673,14 +4313,12 @@ p, li { white-space: pre-wrap; }
         <translation>Плохая сеть: непрозрачный NAT, не работает DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Перезапуск сети</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>За маршрутизатором</translation>
     </message>
@@ -3690,8 +4328,7 @@ p, li { white-space: pre-wrap; }
         <translation>DHT не работает</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>СОСТОЯНИЕ СЕТИ ХОРОШЕЕ!</translation>
     </message>
@@ -3716,7 +4353,7 @@ p, li { white-space: pre-wrap; }
         <translation>Поиск участников тёмной сети</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Поиск узла требует DHT</translation>
     </message>
@@ -4008,7 +4645,7 @@ p, li { white-space: pre-wrap; }
         <translation>Пожалуйста, повторите попытку импорта полного сертификата.</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4016,8 +4653,7 @@ p, li { white-space: pre-wrap; }
         <translation>Нет данных</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>НЕПРОВЕРЕННАЯ ПЕРЕСЫЛКА!</translation>
     </message>
@@ -4027,7 +4663,7 @@ p, li { white-space: pre-wrap; }
         <translation>Неподдающееся проверке перенаправление! DHT не работает</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Поиск</translation>
     </message>
@@ -4063,12 +4699,12 @@ p, li { white-space: pre-wrap; }
         <translation>Подробности о круге</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Имя круга, контакты автора и список приглашённых будут видны всем приглашённым участникам. Если круг не является приватным, он также будет виден соседним узлам, на которых размещаются приглашённые члены.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4088,7 +4724,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>Идентификаторы</translation>
     </message>
@@ -4108,18 +4744,18 @@ p, li { white-space: pre-wrap; }
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Псевдоним</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Приглашённые пользователи</translation>
     </message>
@@ -4134,7 +4770,15 @@ p, li { white-space: pre-wrap; }
         <translation>Известные пользователи</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">Идентификатор</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Тип</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -4174,19 +4818,23 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Информация о круге может быть доступна участникам другого круга. В данном случае участникам этого круга будут доступны все арибуты первого круга (список участников, авторство и т. п.), а также привязанный к нему контент.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Видим только членам круга:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Пожалуйста, установите название вашего круга</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Не выбрано ограничение круга</translation>
     </message>
@@ -4196,24 +4844,12 @@ p, li { white-space: pre-wrap; }
         <translation>Не выбраны ограничения круга</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
@@ -4223,7 +4859,7 @@ p, li { white-space: pre-wrap; }
         <translation>Удалить </translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Поиск</translation>
@@ -4238,6 +4874,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Подписано</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Подписано известными узлами</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4254,6 +4894,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP-личность</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Анонимный идентификатор</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4276,13 +4920,17 @@ p, li { white-space: pre-wrap; }
         <translation>Создать новый круг</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">Идентификатор, привязанный к PGP-ключу</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Добавить члена</translation>
     </message>
@@ -4301,7 +4949,7 @@ p, li { white-space: pre-wrap; }
         <translation>Создать группу</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Имя группы:</translation>
     </message>
@@ -4336,7 +4984,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Новое сообщение канала</translation>
     </message>
@@ -4346,7 +4994,7 @@ p, li { white-space: pre-wrap; }
         <translation>Сообщение канала</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4407,11 +5055,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Используйте кнопку &quot;Перетащить и Отпустить / Добавить файлы&quot;, чтобы хешировать новые файлы.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Копируйте / вставьте ссылки RetroShare ваших файлов&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Добавить файл во вложение</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Добавить изображение-миниатюру для канала</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Сообщение</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Тема:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4497,17 +5157,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4526,18 +5186,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Файл уже добавлен и хеширован</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Добавьте тему сообщения</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Загрузить изображение-миниатюру</translation>
     </message>
@@ -4552,12 +5211,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Создание массовой информации</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Вы действительно хотите создать %1 сообщений?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Вы хотите добавить файлы которые не ещё не общедоступны. Продолжить в любом случае?</translation>
     </message>
@@ -4591,7 +5256,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Создать сообщение на форуме</translation>
     </message>
@@ -4600,6 +5265,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Форум</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Тема</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4620,8 +5289,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4640,7 +5309,7 @@ p, li { white-space: pre-wrap; }
         <translation>Вы можете добавить файлы перетаскиванием</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4670,17 +5339,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Нет форума</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>В ответ на</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Название</translation>
     </message>
@@ -4734,7 +5403,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Загрузить файл изображения</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>Нет совместимого идентификатора для этого форума</translation>
     </message>
@@ -4744,8 +5413,8 @@ Do you want to discard this message?</source>
         <translation>Ни один из ваших идентификаторов не имеет прав для отправки сообщений в этот форум. Возможно, доступ к форуму ограничен кругом, в котором вы не состоите, или форум требует наличие подписанного идентификатора.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Создание массовой информации</translation>
     </message>
@@ -4754,6 +5423,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Вы действительно хотите создать %1 сообщений?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Отправить</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4768,7 +5441,23 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Создать чат-комнату</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Комната чата – децентрализованная и анонимная чат-группа. Все участники публично отправляют и принимают сообщения друг друга. После создания комнаты чата вы можете пригласить туда других участников из своего окружения, воспользовавшись кнопкой вверху справа с подсказкой «Пригласить участников в эту чат-комнату»</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Имя комнаты:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Тема:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4803,7 +5492,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Создать</translation>
     </message>
@@ -4813,7 +5502,11 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если вы отметите это, только подписанные участники смогут общаться в этой комнате. Это ограничение предотвращает спам от имени анонимных участников и делает возможным или, по меньшей мере, определить узел спаммера.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>требовать PGP-подписи личностей</translation>
     </message>
@@ -4828,7 +5521,11 @@ Do you want to discard this message?</source>
         <translation>Отметьте участников, с которыми вы желаете организовать чат</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Приглашённые участники</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Создать чат-комнату</translation>
@@ -4849,7 +5546,7 @@ Do you want to discard this message?</source>
         <translation>Контакты:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Личность для использования:</translation>
     </message>
@@ -4857,17 +5554,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Публичная информация</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Местоположение:</translation>
     </message>
@@ -4877,12 +5574,12 @@ Do you want to discard this message?</source>
         <translation>Идентификатор местоположения:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Версия программы:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Подключён с:</translation>
     </message>
@@ -4902,7 +5599,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4912,7 +5614,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Прочее</translation>
     </message>
@@ -4922,12 +5624,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished">Профиль</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Сертификат</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4937,7 +5644,11 @@ Do you want to discard this message?</source>
         <translation>Вставить подписи</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Сохранить ключ в файл</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Экспорт личности</translation>
     </message>
@@ -5011,33 +5722,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>PGP-отпечаток:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Сведения об узле сети</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP-идентификатор:</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Доверенные узлы:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5076,6 +5787,14 @@ and use the import button to load it</source>
         <source>Node</source>
         <translation>Узел сети</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Создание нового узла...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">Показать окно статистики</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5092,6 +5811,10 @@ and use the import button to load it</source>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;RetroShare использует DHT-сеть BitTorrent в качестве вспомогательной службы для установления соединений. В DHT не  хранится ваш IP-адрес. 				                        DHT используется участниками из вашего окружения для установления соединения через стандартные DHT-запросы. 												Индикатор статуса DHT станет зелёным сразу же, как только RetroShare получит DHT-ответ от одного из ваших контактов.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5127,7 +5850,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>Б</translation>
     </message>
@@ -5795,7 +6518,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Начальный файл</translation>
     </message>
@@ -5803,38 +6526,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>кому</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>без учёта регистра</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>dd.MM.yyyy</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>КБ</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>МБ</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>ГБ</translation>
     </message>
@@ -5842,12 +6565,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Визуализация выражения</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Удалить это выражение</translation>
     </message>
@@ -6009,7 +6732,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Изображение</translation>
     </message>
@@ -6019,7 +6742,7 @@ and use the import button to load it</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Аудио</translation>
     </message>
@@ -6079,21 +6802,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation>C </translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Папки доверенных участников</translation>
     </message>
@@ -6215,7 +6928,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation>Идентификатор</translation>
     </message>
@@ -6250,6 +6963,10 @@ and use the import button to load it</source>
         <source>Show State</source>
         <translation>Показать состояние</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">Доверенные узлы</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6257,7 +6974,7 @@ and use the import button to load it</source>
         <translation>Показать группы</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Группа</translation>
     </message>
@@ -6293,7 +7010,7 @@ and use the import button to load it</source>
         <translation>добавить в группу</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Поиск</translation>
@@ -6309,7 +7026,7 @@ and use the import button to load it</source>
         <translation>Сортировать по состоянию</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Сведения об узле</translation>
     </message>
@@ -6553,7 +7270,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Подтвердить запрос на установление контакта</translation>
     </message>
@@ -6570,6 +7287,10 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Поиск:</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6591,7 +7312,7 @@ at least one peer was not added to a group</source>
         <translation>Поиск контактов</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Отметить все</translation>
     </message>
@@ -6602,134 +7323,16 @@ at least one peer was not added to a group</source>
         <translation>Снять отметки</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Имя</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished">Адрес</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Статус</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Добавить узел в окружение</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished">Прокси не включён или неисправен.
-Все ли службы запущены и работают?
-Также проверьте порты.</translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Изменить ваш статус</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Широковещательный чат</translation>
     </message>
@@ -6812,38 +7415,33 @@ Also check your ports!</source>
         <translation>Сбросить настройки шрифта</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Массив ключей</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt; Сеть&lt;/h1&gt; &lt;p&gt;Вкладка «Сеть» показывает ваше доверенное окружение в сети RetroShare, а именно: те узлы RetroShare, с которыми вы соединены или можете соединиться, когда участник появится в сети.     &lt;/p&gt; &lt;p&gt;Можно группировать узлы, чтобы позднее детально разграничить уровень доступа к информации, например, разрешить только определённым узлам видеть определённые файлы или структуру ваших папок.&lt;/p&gt;     &lt;p&gt;Справа, вы найдете 3 полезные вкладки: &lt;ul&gt;&lt;li&gt;Широковещательный чат отправляет сообщения сразу всем подключенным узлам &lt;/li&gt; &lt;li&gt;Граф локальной сети отображает в удобной форме окружающие вас узлы, основываясь на информации, полученной от специального сервиса обнаружения&lt;/li&gt; &lt;li&gt;Массив ключей содержит идентификаторы пользователей, собранных вашим клиентом от других участников сети&lt;/li&gt;&lt;/ul&gt;&lt;/p&gt;                                                                                                        </translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Широковещательный чат RetroShare: сообщения будут рассылаться всем подключённым узлам.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Визуализация сети</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Установить сообщение о своём статусе</translation>
     </message>
@@ -6861,17 +7459,7 @@ Also check your ports!</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Все поля должны обязательно быть заполнены текстом, состоящим из не менее 3 символов</translation>
     </message>
@@ -6881,12 +7469,17 @@ Also check your ports!</source>
         <translation>Пароли не совпадают</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation>Использовать BOB</translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Данный пароль предназначен для PGP</translation>
@@ -6907,38 +7500,50 @@ Also check your ports!</source>
         <translation>Не удалось создать ваш новый сертификат. Может быть, введён неправильный пароль PGP!</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <source>Options</source>
+        <translation type="vanished">Параметры</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation>Длина ключа PGP</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Введите здесь надёжный пароль. Пароль не должен быть короче восьми символов и содержать тривиальных комбинаций букв и цифр. Это очень важно, так как этот пароль защищает ваш приватный ключ!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Прежде, чем продолжить, подвигайте мышью, чтобы собрать необходимые случайные данные. Индикатор прогресса должен дойти как минимум до 20%, но желательно достигнуть 100%&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Регулярный узел</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">Скрытый Tor- / i2p-узел</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Название вашего узла определяет имя экземпляра клиент-сервера RetroShare, &lt;/p&gt;&lt;p&gt;который будет запущен на этом компьютере&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <source>Use existing profile</source>
+        <translation type="vanished">Использовать существующий профиль</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Название узла</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6958,12 +7563,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Имя профиля идентифицирует вас в рамках вашего сетевого окружения.&lt;/p&gt;&lt;p&gt;Оно используется участниками сети, чтобы отличить вас от других участников и установить с вами соединение.&lt;/p&gt;&lt;p&gt;В рамках одного профиля вы имеете возможность&lt;/p&gt;&lt;p&gt;создать на различных машинах множество узлов с разными названиями.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Экспортировать профиль</translation>
     </message>
@@ -6973,43 +7578,42 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Здесь следует указать onion-адрес наподобие: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;, или же i2p-адрес в форме: [52 символа].b32.i2p &lt;/p&gt;&lt;p&gt;Для того, чтобы получить такие адреса, вам необходимо сконфигурировать скрытые или Tor-, или i2p-сервисы/серверы. В случае, если у вас нет ни того, ни другого, вы можете пропустить этот шаг и вернуться к настройкам позднее через конфигурационную панель RetroShare:  Настройки → Сеть → Настройка скрытых сервисов.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Личности-идентификаторы используются при общении в чатах, а также когда вы оставляете комментарии к сообщениям в форумах или каналах. &lt;/p&gt;&lt;p&gt;Кроме того, они необходимы для адресации участников при пересылке сообщений через встроенный почтовый сервис RetroShare.&lt;/p&gt;&lt;p&gt;У вас есть возможность создать анонимную или подписанную личность прямо сейчас. Но сделать это можно и позднее, воспользовавшись вкладкой «Участники».&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>Начнём!</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Дополнительные параметры</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>Скрытый адрес</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Ваш профиль связан с парой ключей PGP. В настоящее время RetroShare игнорирует DSA-ключи.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Это ваш порт подключения&lt;/p&gt; &lt;p&gt;Любое значение от 1024 до 65535&lt;/p&gt; &lt;p&gt;допустимо. Вы можете изменить его позже.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7057,13 +7661,13 @@ and use the import button to load it</source>
         <translation>Ваш профиль не был сохранён. Произошла ошибка.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Импортировать профиль</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Создать новый профиль и узел RetroShare</translation>
     </message>
@@ -7073,7 +7677,7 @@ and use the import button to load it</source>
         <translation>Создать новый узел RetroShare</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation>Адрес Tor/I2P</translation>
     </message>
@@ -7108,7 +7712,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7118,7 +7722,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Создание узла отключено до тех пор, пока не будут правильно заданы все поля.&lt;/p&gt;</translation>
     </message>
@@ -7128,7 +7737,12 @@ and use the import button to load it</source>
         <translation>&lt;p&gt;Создание узла отключено, пока не будет собрано достаточное количество случайных чисел. Пожалуйста, перемещайте мышь по кругу, пока не будет достигнуто по крайней мере 20%.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation>Адрес экземпляра I2P с включённым BOB</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation>Адрес экземпляра I2P</translation>
     </message>
@@ -7354,13 +7968,36 @@ and use the import button to load it</source>
         <translation>Быстрый старт</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Пригласить участников</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;RetroShare – это анонимная приватная f2f-сеть, поэтому вам необходимо соединиться как минимум с одним действующим участником сети. Нажмите на кнопку, чтобы добавить участника себе в окружение.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Отправьте приглашение с вашим сертификатом по электронной почте.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Аналогично получите приглашения от других участников сети. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Помните: соединение в тёмной сети RetroShare предполагает взаимный обмен сертификатами; только в этом случае вы сможете соединиться с контрагентом.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Добавить ваших друзей и близких в RetroShare</translation>
     </message>
@@ -7370,103 +8007,136 @@ and use the import button to load it</source>
         <translation>Добавить узлы в окружение</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Соединиться с доверенными узлами</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&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;
+&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:12pt;&quot;&gt;Запустите RetroShare в то же время, что и ваш доверенный узел, и RetroShare в автоматическом режиме соединит вас!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Вашему клиенту необходимо найти сеть RetroShare до того, как станут возможными соединения между узлами.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Обычно это занимает 2-30 минут после первого запуска RetroShare. Не забудьте включить UPnP в вашем модеме или роутере!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Если индикатор DHT (см. кружок на панели состояния внизу) стал зелёным, то соединения с узлами сети возможны.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Если у вас работает UPnP или вручную настроен открытый порт, индикатор NAT (также см. на панель состояния) переключается из жёлтого состояния в зелёное.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Если он остаётся в красном состоянии, тогда это говорит о непрозрачном межсетевом экране, сквозь который RetroShare будет пытаться «пробиться».&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Посмотрите в раздел «Помощь», чтобы получить более полную информацию о соединениях.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;/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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&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;
 &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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Дополнительная настройка: открыть порт межсетевого экрана</translation>
+&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:12pt;&quot;&gt;Вы можете существенно улучшить производительность и соединяемость Retroshare, открыв в вашем модеме или роутере внешний порт. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Это ускорит соединения с другими узлами, так как позволит другим участникам, у которых нет открытого порта, легко подключаться к вам. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Простейший способ это сделать – активировать UPnP в вашем модеме или роутере.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Так как модемов и роутеров множество и настраиваются они по-разному, мы рекомендуем вам поискать в Интернете информацию по запросу следующего вида: «открыть порт в модеме &lt;модель_модема&gt;.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Если всё же вам не удалось открыть порт, не беспокойтесь, Retroshare всё равно будет работать: в сети множество пользователей с открытыми портами.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&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;
+&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:12pt;&quot;&gt;Имеются трудности в освоении RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Почитайте FAQ в Вики. Материал слегка устарел, но он всё же содержит основную информацию.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Почитайте форумы в Интернете. Задайте там актуальные для вас вопросы или укажите нерешённые проблемы.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Если вы уже подключены к сети, почитайте внутренные форумы RetroShare.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	– подчеркнём: они доступны только в том случае, если у вас имеется хотя бы один соединённый с вами узел.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) Если у вас ничего не получается, зайдите на сайт https://adorabilis.wordpress.com или в группу Вконтакте https://vk.com/retroshare и оставьте комментарий с вопросом в одной из тем. Вам обязательно ответят.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Соединиться с доверенными узлами</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&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;
+&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:12pt;&quot;&gt;Когда контрагенты отправят вам свои приглашения, чтобы их добавить, откройте окно &quot;Добавить узлы в окружение&quot;.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Вставьте &amp;quot;сертификаты&amp;quot; в окне и добавьте их как доверенные узлы.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Дополнительная настройка: открыть порт межсетевого экрана</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Дополнительная помощь и поддержка</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>Открыть официальный сайт RetroShare</translation>
     </message>
@@ -7491,7 +8161,7 @@ p, li { white-space: pre-wrap; }
         <translation>Написать отзыв</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>Приглашение из RetroShare</translation>
     </message>
@@ -7541,12 +8211,12 @@ p, li { white-space: pre-wrap; }
         <translation>Отзывы о RetroShare</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>Команда поддержки RetroShare</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>В ней много особенностей, включая встроенный чат, систему передачи сообщений,</translation>
     </message>
@@ -7670,7 +8340,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Показать групповой чат</translation>
     </message>
@@ -7678,7 +8348,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[неизвестно]</translation>
     </message>
@@ -7844,11 +8514,19 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Вы имеете возможность поделиться с доверенным окружением информацией о созданном вами форуме. Выберите контакты, которым вы хотели бы дать информацию о созданном форуме.</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">Разрешения администратора общей темы</translation>
+    </message>
+    <message>
+        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
+        <translation type="vanished">Вы можете разрешить вашим контактам изменять тему. Для этого выберите тот или иной контакт в списке ниже. Примечание: невозможно отобрать права администратора в сервисе публикаций.</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Название</translation>
     </message>
@@ -7861,12 +8539,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7891,7 +8569,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">Сортировать по убыванию</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">Сортировать по возрастанию</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">Сортировать по имени</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Сортировать по популярности</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Сортировать по последнему сообщению</translation>
+    </message>
+    <message>
+        <source>Sort by Number of Posts</source>
+        <translation type="vanished">Сортировать по количеству сообщений</translation>
+    </message>
+    <message>
+        <source>Sort by Unread</source>
+        <translation type="vanished">Сортировать по количеству непрочтённых сообщений</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Вы администратор (изменяйте название и описание используя меню &quot;Редактировать&quot;)</translation>
     </message>
@@ -7906,14 +8612,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Идентификатор</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Последнее непрочтённое</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
@@ -7924,13 +8630,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Популярность</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Показать</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7943,7 +8653,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>и</translation>
     </message>
@@ -8079,7 +8789,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Каналы</translation>
@@ -8090,22 +8800,26 @@ p, li { white-space: pre-wrap; }
         <translation>Создать канал</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Включить автоматическое скачивание</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Мои каналы</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Каналы&lt;/h1&gt; &lt;p&gt;Каналы дают возможность публиковать контент (например, кино или музыку), который подлежит раздаче пользователям сети.&lt;/p&gt; &lt;p&gt;В списке каналов содержатся те каналы, на которые подписано ваше доверенное окружение, равно как и ваш узел автоматически отсылает окружению информацию о каналах, на которые подписаны вы. Такой механизм позволяет распространять по сети информацию о хороших каналах и блокировать неудачные.&lt;/p&gt; &lt;p&gt;Оставлять сообщения в канале может только его создатель. Остальные участники могут лишь читать его содержимое и только в том случае, если канал не является приватным. Тем не менее, вы можете ⇥ дать права на чтение или модификацию канала пользователям из доверенного окружения.&lt;/p&gt;⇥ &lt;p&gt;Канал может быть анонимным или псевдонимным, если за ним закреплён определённый идентификатор пользователя. ⇥ Включите режим «Разрешить комментарии», если Вы хотите дать пользователям возможность комментировать сообщения.&lt;/p&gt; &lt;p&gt;Сообщения канала удаляются через %1 месяца.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Подписка на каналы</translation>
     </message>
@@ -8125,12 +8839,12 @@ p, li { white-space: pre-wrap; }
         <translation>Выберите папку загрузки для канала</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Отменить автоматическое скачивание</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>Выберите папку загрузки</translation>
     </message>
@@ -8165,22 +8879,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Воспроизвести</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Открыть папку</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -8200,17 +8914,17 @@ p, li { white-space: pre-wrap; }
         <translation>Проверка</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Вы уверены, что хотите отменить операцию и удалить файл?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Не удалось открыть папку</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Проиграть файл</translation>
     </message>
@@ -8220,10 +8934,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Файл %1 не существует в указанном месте.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Форма</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Имя файла</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Размер</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Название</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Опубликовано</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Статус</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Создать новый канал</translation>
     </message>
@@ -8261,19 +9002,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Текстовая метка</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Подписаться на канал</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8287,7 +9018,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Раскрыть</translation>
     </message>
@@ -8302,7 +9033,7 @@ p, li { white-space: pre-wrap; }
         <translation>Описание канала</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Загрузка</translation>
     </message>
@@ -8317,9 +9048,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">Никогда</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Новый канал</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8330,7 +9060,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Новый комментарий:</translation>
     </message>
@@ -8351,7 +9081,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
@@ -8407,24 +9137,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>файлов</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Внимание! У вас есть менее %1 часов и %2 минут, прежде чем файл будет удалён. Рассмотрите возможность его сохранения.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Скрыть</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
     </message>
@@ -8439,17 +9173,21 @@ p, li { white-space: pre-wrap; }
         <translation>Мне не понравилось</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Загрузка</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation>Комментарии </translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8474,16 +9212,139 @@ p, li { white-space: pre-wrap; }
         <translation>Проиграть медиафайл</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Создать сообщение в канале</translation>
+    </message>
+    <message>
+        <source>Add new post</source>
+        <translation type="vanished">Добавить новое сообщение</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Загрузка</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Поиск каналов</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Название</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Поиск по названию</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Почтовая служба</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Поиск сообщения</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Имя файла</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Поиск файла по имени</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Не выбраны каналы</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Никогда</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Публичный</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle &quot;</source>
+        <translation type="vanished">Только для членов круга &quot; </translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle </source>
+        <translation type="vanished">Только для членов круга</translation>
+    </message>
+    <message>
+        <source>Your eyes only</source>
+        <translation type="vanished">Только для вас</translation>
+    </message>
+    <message>
+        <source>You and your friend nodes</source>
+        <translation type="vanished">Вы и ваше окружение</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Отменить автоматическое скачивание</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Включить автоматическое скачивание</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Отобразить сообщения</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Показать файлы</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Администратор:</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Последнее сообщение:</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">неизвестно</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Распространение:</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Каналы</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">файлов</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Подписчики</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Описание:</translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">Сообщений (соседние узлы):</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Создать сообщение в канале</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished">Добавить новое сообщение</translation>
     </message>
@@ -8553,7 +9414,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8589,7 +9450,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Комментарии</translation>
     </message>
@@ -8604,13 +9465,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Каналы</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8625,7 +9486,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8640,7 +9501,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8700,22 +9561,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8772,12 +9623,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished">Ограничено для членов круга &quot;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished">Ограничено для членов круга </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8790,13 +9641,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Вы и ваше окружение</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8847,17 +9697,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8877,11 +9727,27 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Удалить объект</translation>
     </message>
+    <message>
+        <source>for identity </source>
+        <translation type="vanished">для личности </translation>
+    </message>
+    <message>
+        <source>You received a membership request for circle:</source>
+        <translation type="vanished">Вы получили запрос на членство в круге:</translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Удовлетворить запрос на членство</translation>
     </message>
+    <message>
+        <source>Revoke membership request</source>
+        <translation type="vanished">Отказать в запросе на членство</translation>
+    </message>
+    <message>
+        <source>You received an invitation for circle:</source>
+        <translation type="vanished">Вы получили приглашение в круг:</translation>
+    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -8972,7 +9838,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Контейнер комментариев</translation>
     </message>
@@ -8985,7 +9851,7 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9015,7 +9881,7 @@ p, li { white-space: pre-wrap; }
         <translation>Обновить</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
@@ -9054,7 +9920,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Ответ на комментарий</translation>
     </message>
@@ -9078,21 +9944,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Голосовать против</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9102,7 +9953,7 @@ p, li { white-space: pre-wrap; }
         <translation>Сделать комментарий</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9131,10 +9982,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Комментарий&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Подписано</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9163,7 +10030,7 @@ before you can comment</source>
 чем вы сможете комментировать</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9205,6 +10072,14 @@ before you can comment</source>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Добавить администраторов форума</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Выбрать администраторов форума</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9214,7 +10089,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Подписаться на форум</translation>
     </message>
@@ -9230,7 +10105,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Раскрыть</translation>
     </message>
@@ -9250,9 +10125,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Текстовая метка</translation>
+        <source>Loading</source>
+        <translation type="vanished">Загрузка</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9283,13 +10157,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Отписаться от форума</translation>
     </message>
@@ -9300,7 +10174,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Раскрыть</translation>
     </message>
@@ -9320,17 +10194,21 @@ before you can comment</source>
         <translation>В ответ на:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Загрузка</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Послать в форум</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Скрыть</translation>
     </message>
@@ -9343,66 +10221,63 @@ before you can comment</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Начать новую тему в выбранном форуме</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Поиск по форумам</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Последнее сообщение</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation>Новая тема</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Древовидный вид</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Плоский вид</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Сохранить изображение</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Загрузка</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9412,7 +10287,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Ответить на сообщение</translation>
     </message>
@@ -9436,6 +10316,10 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>Скачать все файлы</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Следующее непрочитанное</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9452,23 +10336,35 @@ before you can comment</source>
         <translation>Поиск Автора</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Содержимое</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Поиск контента</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Подписка на форум означает, что ваш клиент будет собирать среди доверенного окружения все имеющиеся сообщения, а также, в свою очередь, делать форумный котент видимым для других участников из вашего окружения.&lt;/p&gt; &lt;p&gt;Впоследствии, при желании, вы сможете отписаться от форума, воспользовавшись контекстным меню.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Без названия</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Ответ</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9511,12 +10407,20 @@ before you can comment</source>
         <translation>Скопировать ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Скрыть</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Раскрыть</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Заблокировано]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[неизвестно]</translation>
     </message>
@@ -9546,8 +10450,8 @@ before you can comment</source>
         <translation>Только для вас</translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation>Распространение</translation>
     </message>
@@ -9561,6 +10465,26 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation>Анти-спам</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Отредактированное сообщение ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Аноним</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">подписано</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">нет</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Пропущенное сообщение ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9630,12 +10554,16 @@ before you can comment</source>
         <translation>Оригинал сообщения</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation>Новая тема</translation>
     </message>
     <message>
-        <location line="+331"/>
+        <source>Read status</source>
+        <translation type="vanished">Указывать состояние прочитано / не прочитано</translation>
+    </message>
+    <message>
+        <location line="+318"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
@@ -9696,7 +10624,7 @@ before you can comment</source>
         <translation>Репутация автора</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9716,7 +10644,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Сообщения анонимных авторов, а также авторов с неизвестными ключами, будут перенаправляться, если их репутация положительна</translation>
     </message>
@@ -9768,7 +10696,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9778,7 +10706,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9793,7 +10721,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <source>Information for this identity is currently missing.</source>
+        <translation type="vanished">В настоящее время информация об этой личности отсутствует</translation>
+    </message>
+    <message>
+        <source>You have banned this ID. The message will not be
+displayed nor forwarded to your friends.</source>
+        <translation type="vanished">Вы заблокировали этого участника. Его сообщения
+не будут отображаться и не будут транслироваться вашему окружению.</translation>
+    </message>
+    <message>
+        <source>You have not set an opinion for this person,
+ and your friends do not vote positively: Spam regulation 
+prevents the message to be forwarded to your friends.</source>
+        <translation type="vanished">Вы не указали своё мнение об этом участнике,
+но некоторые узлы из вашего окружения установили для него отрицательную репутацию. Поэтому система предотвращения спама в вашем клиент-сервере не будет транслировать сообщения этого участника другим узлам из вашего окружения.</translation>
+    </message>
+    <message>
+        <source>Message will be forwarded to your friends.</source>
+        <translation type="vanished">Сообщения не будут перенаправляться вашему окружению.</translation>
+    </message>
+    <message>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation>(Последнее) </translation>
     </message>
@@ -9802,6 +10751,10 @@ This message is missing. You should receive it later.</source>
         <source>(Old) </source>
         <translation>(Старое) </translation>
     </message>
+    <message>
+        <source>You cant act on the author to a non-existant Message</source>
+        <translation type="vanished">Вы не можете влиять на автора несуществующего сообщения.</translation>
+    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -9859,12 +10812,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Форумы&lt;/h1&gt; ⇥⇥⇥&lt;p&gt;Форумы в RetroShare выглядят схоже и преследуют те же цели, что и интернет-форумы. Ключевым отличием является их децентрализованность.&lt;/p&gt; ⇥⇥⇥&lt;p&gt;В списке доступных форумов значатся форумы, на которые подписано ваше доверенное окружение. В свою очередь, вы отдаёте окружению информацию о том,⇥⇥⇥на какие форумы подписаны вы. Такой механизм распространения продвигает по сети хорошие форумы и блокирует неудачные.&lt;/p&gt; &lt;р&gt; Сообщения форумов хранятся в течение %1 дней и синхронизируются с другими узлами в течение %2 дней. &lt;/p&gt; &lt;р&gt; У вас есть возможность изменить эти значения.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Форумы</translation>
@@ -9895,16 +10848,35 @@ This message is missing. You should receive it later.</source>
         <translation>Другие форумы</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">ожидание</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Получение</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Загрузка</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Добавить значок</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Получатели ключа могут публиковать сообщения в группы с ограниченным доступом, просматривать и публиковать сообщения в приватных каналах</translation>
     </message>
@@ -9913,14 +10885,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Поделиться публичным ключом</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">проверить участников, с которыми вы хотите поделиться приватным ключом</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Поделиться ключом с</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Распространение сообщений</translation>
     </message>
@@ -9928,7 +10908,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Публичные</translation>
     </message>
@@ -9947,6 +10927,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Новая тема</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Требуется</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Шифрованное сообщение</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9988,7 +10976,7 @@ This message is missing. You should receive it later.</source>
         <translation>Защита от спама</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Комментарии:</translation>
     </message>
@@ -10011,7 +10999,7 @@ This message is missing. You should receive it later.</source>
         <translation>Анти-спам:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10027,12 +11015,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation>Ограничено кругом:</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation>Ограничено вашими доверенными узлами</translation>
     </message>
@@ -10049,23 +11037,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>Отслеживание сообщений</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>Необходима PGP-подпись</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Никогда</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation>Только для доверенных участников в группе</translation>
     </message>
@@ -10081,28 +11069,30 @@ This message is missing. You should receive it later.</source>
         <translation>Добавьте имя</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>Необходима PGP-подпись от известного идентификатора</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Загрузить логотип группы</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Отправить изменения группы</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Не удалось подготовить метаданные группы - пожалуйста, проверьте</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Будет использовано для обратной связи</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Владелец:</translation>
     </message>
@@ -10112,12 +11102,12 @@ This message is missing. You should receive it later.</source>
         <translation>Укажите здесь осмысленное описание</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Сведения</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>Идентификатор</translation>
     </message>
@@ -10127,7 +11117,7 @@ This message is missing. You should receive it later.</source>
         <translation>Последнее сообщение</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Сообщения будут распространяться далеко за пределы вашего доверенного окружения до тех пор, пока кто-нибудь подписан на созданный вами канал/форум/публикацию.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -10202,12 +11192,7 @@ This message is missing. You should receive it later.</source>
         <translation>Запретить неподписанные и неизвестные идентификаторы</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Популярность</translation>
     </message>
@@ -10223,22 +11208,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Создать</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Автор</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>Идентификатор Gxs</translation>
     </message>
@@ -10246,7 +11236,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Загрузка</translation>
     </message>
@@ -10306,7 +11296,7 @@ This message is missing. You should receive it later.</source>
         <translation>Редактировать подробности</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation>Синхронизировать контент в течение...</translation>
     </message>
@@ -10363,12 +11353,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <source>Share publish permissions</source>
+        <translation type="vanished">Поделиться правами на запись</translation>
+    </message>
+    <message>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Скопировать ссылку RetroShare</translation>
     </message>
@@ -10391,7 +11385,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Без подписи</translation>
     </message>
@@ -10404,24 +11398,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Загрузка</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Не найден</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Без подписи</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Заблокировано]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Аутентификация</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>неизвестный ключ</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">анонимный</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10431,12 +11441,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Имя&amp;nbsp;личности </translation>
     </message>
@@ -10450,20 +11455,16 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">Подписано</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[неизвестный]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10475,7 +11476,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10523,13 +11524,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Загрузка</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10646,6 +11651,10 @@ This message is missing. You should receive it later.</source>
         <source>Group ID / Author</source>
         <translation>Идентификатор группы / автор</translation>
     </message>
+    <message>
+        <source>Number of messages / Publish TS</source>
+        <translation type="vanished">Количество сообщений / Время публикации</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -10661,6 +11670,10 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation>Популярность</translation>
     </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Подробности</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -10693,6 +11706,41 @@ This message is missing. You should receive it later.</source>
         <translation>Нет</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">Авторизованные туннели:</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">Идентификатор туннеля: %1</translation>
+    </message>
+    <message>
+        <source>from: %1</source>
+        <translation type="vanished">от: %1</translation>
+    </message>
+    <message>
+        <source>to: %1</source>
+        <translation type="vanished">к: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">статус: %1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">всего отправлено: %1 байт</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">всего получено: %1 байт</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Неизвестный участник</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10717,17 +11765,17 @@ This message is missing. You should receive it later.</source>
     <message>
         <location filename="../gui/statusbar/hashingstatus.cpp" line="+78"/>
         <source>Examining shared files...</source>
-        <translation>Проверка файлов, открытых к доступу...</translation>
+        <translation type="unfinished">Проверка файлов, открытых к доступу...</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Hashing file</source>
-        <translation>Хеширование файла</translation>
+        <translation type="unfinished">Хеширование файла</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Saving file index...</source>
-        <translation>Сохранение списка файлов...</translation>
+        <translation type="unfinished">Сохранение списка файлов...</translation>
     </message>
 </context>
 <context>
@@ -10905,12 +11953,48 @@ This message is missing. You should receive it later.</source>
         <source>About</source>
         <translation>О программе</translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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-weight:600;&quot;&gt;RetroShare – это кроссплатформенное приложение на основе открытого ПО, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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-weight:600;&quot;&gt;персональная защищённая децентрализованная коммуникационная система.⇥&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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-weight:600;&quot;&gt;Она позволяет осуществлять безопасный файлообмен совместно с доверенными участниками,  &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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-weight:600;&quot;&gt;использует сеть доверия для установления подлинности участников и OpenSSL для шифрования всей передаваемой информации. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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-weight:600;&quot;&gt;RetroShare предоставляет сервисы файлообмена, чатов, электронной почты и каналов&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&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;Следующие полезные ссылки дают больше сведений:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Вебсайт Retroshare&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Вики-страница Retroshare&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Форум RetroShare&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Страница проекта Retroshare&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Блог команды RetroShare&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;Twitter разработчиков RetroShare&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+37"/>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10926,7 +12010,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Авторы</translation>
     </message>
@@ -10945,7 +12029,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10958,6 +12042,36 @@ 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Перевод интерфейса RetroShare:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Переводчики веб-сайта RetroShare:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Шведский язык: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Немецкий язык: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Польский язык: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -11023,34 +12137,50 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+121"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Скопируйте свой идентификатор RetroShare в буфер обмена&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+158"/>
         <source>Add friend</source>
-        <translation>Добавить узел</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
-        <translation>Вы получили идентификатор Retroshare от друга?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+85"/>
         <source>Do you need help with Retroshare?</source>
-        <translation>Вам нужна помощь с Retroshare?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Поделитесь своим идентификатором RetroShare&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-63"/>
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
-        <translation>Это ваш Retroshare ID. Скопируйте и поделитесь с друзьями!</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Did you receive a certificate from a friend?</source>
+        <translation type="vanished">У вас уже есть сертификат другого участника тёмной сети?</translation>
+    </message>
+    <message>
+        <source>Add friends certificate</source>
+        <translation type="vanished">Добавить сертификат</translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">Добавить файл сертификата</translation>
+    </message>
+    <message>
+        <source>Share your RetroShare Key</source>
+        <translation type="vanished">Предоставить мой сертификат</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -11058,6 +12188,10 @@ p, li { white-space: pre-wrap; }
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
+        <translation type="vanished">Текст, который вы видите ниже, есть ваш сертификат. Отправьте его тому, с кем вы желаете соединиться</translation>
+    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -11068,12 +12202,20 @@ private and secure decentralized communication platform.
 </translation>
     </message>
     <message>
-        <location line="+134"/>
+        <source>Launch startup wizard</source>
+        <translation type="vanished">Мастер запуска</translation>
+    </message>
+    <message>
+        <source>Do you need help with RetroShare?</source>
+        <translation type="vanished">Вам нужна помощь по RetroShare?</translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>Open Web Help</source>
         <translation>Открыть помощь в веб</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Скопировать сертификат в буфер обмена</translation>
     </message>
@@ -11083,7 +12225,7 @@ private and secure decentralized communication platform.
         <translation>Сохранить сертификат в файл</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>Послать по электронной почте</translation>
     </message>
@@ -11103,39 +12245,15 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation>Включить историю всех IP-адресов</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
-        <translation>Включите все ваши известные IP-адреса</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
-        <translation>Использовать старый формат сертификата</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
@@ -11145,12 +12263,17 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
-        <source>Use new (short) certificate format</source>
-        <translation>Использовать (короткий) формат сертификата</translation>
+        <location line="+16"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+57"/>
+        <source>Use new (short) certificate format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11159,11 +12282,19 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Добро пожаловать в Retroshare!&lt;/h1&gt;   &lt;p&gt;Вам нужно &lt;b&gt;добавить доверенные узлы&lt;/b&gt;! После добавления доверенных узлов или присоединения к существующей сети,	  вы сможете обмениваться файлами, общаться в чате, на форумах и т. д. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;Для этого скопируйте свой сертификат с этой страницы и отправьте его своим контактам, а также добавьте их сертификаты.&lt;/p&gt;    &lt;p&gt;Другой вариант — найти в интернете &quot;чат-серверы Retroshare&quot; (независимо от администрирования). Эти серверы позволяют обмениваться сертификатами с выделенным узлом Retroshare, через который вы сможете анонимно встречаться с другими людьми.&lt;/p&gt; </translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>Пригласить в RetroShare</translation>
     </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Ваш сертификат скопирован в буфер обмена. Отправьте контрагенту письмо с этим сертификатом по электронной почте или же воспользуйтесь любым другим доступным способом.</translation>
+    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -11435,14 +12566,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Все участники</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Репутация</translation>
     </message>
@@ -11452,12 +12583,12 @@ p, li { white-space: pre-wrap; }
         <translation>Поиск</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>Анонимный идентификатор</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Создать новую личность</translation>
     </message>
@@ -11467,7 +12598,7 @@ p, li { white-space: pre-wrap; }
         <translation>Создать новый круг</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>Действия над участниками</translation>
     </message>
@@ -11482,27 +12613,27 @@ p, li { white-space: pre-wrap; }
         <translation>Участник</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation>Блокировка:</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Автоматически блокировать все личности, созданные этим узлом</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
-        <translation>Голоса друзей:</translation>
+        <translation>Рейтинг согласно мнению участников из окружения:</translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Положительное мнение</translation>
     </message>
@@ -11518,39 +12649,29 @@ p, li { white-space: pre-wrap; }
         <translation>Отрицательное мнение</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
-        <translation>Создано:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation>Профиль автобана</translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation>Изменить личность</translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation>Статистика использования</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Круги</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Имя круга</translation>
     </message>
@@ -11570,20 +12691,18 @@ p, li { white-space: pre-wrap; }
         <translation>Личные круги</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Редактировать личность</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Удалить личность</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Чат с этим участником</translation>
     </message>
@@ -11593,99 +12712,119 @@ p, li { white-space: pre-wrap; }
         <translation>Запустить удалённый чат с этим участником</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
-        <translation>Идентификатор узла:</translation>
+        <translation>Идентификатор владельца узла:</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Псевдоним:</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>Идентификатор личности</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Отправить сообщение</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Информация о личности</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Идентификатор личности:</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
-        <translation>Имя узла:</translation>
+        <translation>Имя владельца узла:</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation>Создать новую личность...</translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Пригласить</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Среднее мнение об этой личности с соседних узлов. Отрицательное — плохо&lt;/p&gt;&lt;p&gt;Положительное — хорошо. Ноль нейтрален. &lt;p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>Ваше мнение:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ваше собственное мнение о личности определяет видимость этой личности для вас самих и ваших доверенных узлов. Ваше мнение передаётся доверенным узлам и используется для вычисления оценки репутации: если ваше мнение о личности нейтрально, оценка репутации — это разница между положительными и отрицательными мнениями ваших контактов, а если нет, то оценку определяет ваше мнение.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Общий балл используется в чатах, форумах и каналах, чтобы определить действия, которые необходимо предпринять в отношении каждой конкретной личности. Когда общий балл меньше -1, личность блокируется, что предотвращает пересылку всех ею созданных сообщений и форумов/каналов, в обоих направлениях. Некоторые форумы также имеют специальные флаги для защиты от нежелательной почты, которые требуют не отрицательного уровня репутации, что делает их более чувствительными к плохим мнениям. Заблокированные личности постепенно теряют свою активность и в конечном итоге исчезают (через 5 дней).&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Вы можете изменить пороговые значения и время бездействия для удаления личностей в &quot;Настройках&quot; → &quot;Участники&quot;. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Negative</source>
-        <translation>Отрицательно</translation>
+        <translation>Отрицательное мнение</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
-        <translation>Нейтральный</translation>
+        <translation>Нейтральное мнение</translation>
     </message>
     <message>
         <location line="+9"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-11"/>
         <source>Positive</source>
-        <translation>Положительный</translation>
+        <translation>Положительное мнение</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Интегральное значение репутации, основанное на вашем мнении и мнении ваших контактов.&lt;/p&gt;&lt;p&gt;Отрицательное значение — плохая репутация, положительное — хорошая, ноль — нейтральная. Если значение слишком низкое,&lt;/p&gt;&lt;p&gt;личность будет помечена как плохая и отфильтрована в форумах, чатах,&lt;/p&gt;&lt;p&gt;каналах и т.п.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Общая:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Анонимные участники</translation>
     </message>
@@ -11700,24 +12839,24 @@ p, li { white-space: pre-wrap; }
         <translation>Поиск идентификатора</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Эта личность закреплена за вами</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>Личности, созданные мною</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>Мои контакты</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation>Показать...</translation>
     </message>
@@ -11732,12 +12871,7 @@ p, li { white-space: pre-wrap; }
         <translation>Личности, привязанные к моему узлу</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>Другие круги</translation>
     </message>
@@ -11747,7 +12881,7 @@ p, li { white-space: pre-wrap; }
         <translation>Круги со мной</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>Идентификатор круга: </translation>
     </message>
@@ -11799,7 +12933,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+4"/>
         <source>unsubscribed (Only receive invite list). Last seen: %1 days ago.</source>
-        <translation>отписался (Только получать список приглашений). Последний раз был в сети: %1 дней назад.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11822,14 +12956,14 @@ p, li { white-space: pre-wrap; }
         <translation>Не член (нет доступа к данным доступным кругу)</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>Идентификатор личности: </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Status: </source>
-        <translation>Статус: </translation>
+        <translation>Статус:</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -11852,7 +12986,7 @@ p, li { white-space: pre-wrap; }
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>Приглашён</translation>
     </message>
@@ -11867,7 +13001,7 @@ p, li { white-space: pre-wrap; }
         <translation>Член</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>Редактировать круг</translation>
     </message>
@@ -11915,7 +13049,7 @@ p, li { white-space: pre-wrap; }
         <translation>Разрешить членство</translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11926,7 +13060,7 @@ These identities will soon be not supported anymore.</source>
 Поддержка таких идентификаторов вскоре прекратится.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[неизвестный узел]</translation>
@@ -11969,7 +13103,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Анонимная личность</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12011,7 +13145,7 @@ These identities will soon be not supported anymore.</source>
     <message>
         <location line="+2"/>
         <source>Message</source>
-        <translation>Сообщение</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -12049,7 +13183,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation>информация</translation>
     </message>
@@ -12065,12 +13199,29 @@ These identities will soon be not supported anymore.</source>
         <translation>Скопировать личность в буфер обмена</translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <source>Send invite?</source>
+        <translation type="vanished">Послать приглашение</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Отправить приглашение с Вашим сертификатом?</translation>
+    </message>
+    <message>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Заблокированные участники</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Личности&lt;/h1&gt;    			&lt;p&gt;В этой вкладке вы имеете возможность создавать/редактировать &lt;b&gt;анонимные и псевдонимные личности&lt;/b&gt;, а также &lt;b&gt;круги&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Личности&lt;/b&gt; используются для безопасной публикации сообщений: от имени личностей вы посылаете сообщения в чаты, форумы и каналы,				получаете отклики через встроенный в RetroShare почтовый сервис, публикуете комментарии 				в каналах, чатах. От имени личностей в определённых случаях прокладываются анонимные туннели и т. п.&lt;/p&gt; 			&lt;p&gt;Личности не обязательно должны быть &lt;b&gt;подписаны&lt;/b&gt; вашим личным сертификатом.   			Подписанные личности иногда полезны, если вы хотите подчеркнуть авторство того или иного сообщения. Однако по подписанным личностям зачастую можно отследить IP-адрес автора сообщения.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Анонимные личности&lt;/b&gt; позволяют вам анонимно, а значит – безопасно, взаимодействовать с другими участниками тёмной сети. Анонимные личности не могут быть подменены,   			 но никто не может однозначно обозначить привязку анонимной личности к конкретному сертификату, а значит – и пользователю.&lt;/p&gt;                 	&lt;p&gt;&lt;b&gt;Круги&lt;/b&gt; – это совокупность личностей (анонимных или подписанных), информация о которых широко распространяется по тёмной сети. Круги используются                 		для создания форумов и каналов, содержимое которых доступно только участникам конкретного круга &lt;/p&gt;                 	&lt;p&gt;&lt;b&gt;Один круг&lt;/b&gt; может быть ограничен другим кругом, как следствие, определяя видимость его участников определённому множеству участников, принадлежащему другому кругу.                  		Есть возможность создавать самый приватный тип кругов, где информация о них доступна только членам самого круга, читайте – закрытого клуба.&lt;/p&gt;                 	&lt;p&gt;&lt;b&gt;Локальный круг&lt;/b&gt; есть совокупность доверенных узлов, представленных их PGP-идентификаторами, и широко используемых для ограничения                 		доступности каналов и форумов. Такого рода круги не распространяются по сети и список его членов доступен только вам.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Unknown ID:</source>
+        <translation type="vanished">Неизвестный идентификатор:</translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation> положительно</translation>
     </message>
@@ -12114,11 +13265,19 @@ These identities will soon be not supported anymore.</source>
         <source>Forums</source>
         <translation>Форумы</translation>
     </message>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Публикации</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Чаты</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Неизвестно</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12139,6 +13298,14 @@ These identities will soon be not supported anymore.</source>
         <source>Creation of author signature in service %1</source>
         <translation>Создание сигнатуры администратора в сервисе %1</translation>
     </message>
+    <message>
+        <source>Message/vote/comment</source>
+        <translation type="vanished">Сообщение / голос / комментарий</translation>
+    </message>
+    <message>
+        <source>%1 in %2 tab</source>
+        <translation type="vanished">%1 во вкладке %2</translation>
+    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12159,11 +13326,19 @@ These identities will soon be not supported anymore.</source>
         <source>Signature in distant tunnel system.</source>
         <translation>Подпись в системе удалённого туннелирования</translation>
     </message>
+    <message>
+        <source>Update of identity data.</source>
+        <translation type="vanished"> обновление данных о личности.</translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Базовая проверка подлинности сигнатуры</translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">Базовая сигнатура</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12175,7 +13350,11 @@ These identities will soon be not supported anymore.</source>
         <translation>Базовое дешифрование.</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <source>Membership verification in circle %1.</source>
+        <translation type="vanished">Проверка членства в круге %1</translation>
+    </message>
+    <message>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation>Добавить в контакты</translation>
     </message>
@@ -12225,21 +13404,21 @@ These identities will soon be not supported anymore.</source>
         <translation>Приветствую, &lt;br&gt;предлагаю обменяться сертификатами RetroShare.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Участники</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Нажмите здесь, чтобы изменить свой аватар</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>Личности, привязанные к ближнему окружению</translation>
     </message>
@@ -12249,7 +13428,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Личности, привязанные к удалённому узлу</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Личности, привязанные к доверенному окружению</translation>
     </message>
@@ -12264,7 +13443,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Привязан к неизвестному узлу</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Начать чат</translation>
     </message>
@@ -12279,12 +13458,12 @@ These identities will soon be not supported anymore.</source>
         <translation>В удалённом чате с этим человеком отказано.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
-        <translation>Последний раз появлялся:</translation>
+        <translation>Последний раз появлялся: </translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 известных PGP</translation>
     </message>
@@ -12304,12 +13483,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Вы действительно хотите удалить эту личность?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Принадлежит...</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Имя узла:</translation>
     </message>
@@ -12319,15 +13498,15 @@ These identities will soon be not supported anymore.</source>
         <translation>Идентификатор узла:</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
-        <translation>Действительно удалить?</translation>
+        <translation>Действительно удалить? </translation>
     </message>
 </context>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Псевдоним</translation>
     </message>
@@ -12357,7 +13536,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Псевдоним</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12367,19 +13546,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Новая личность</translation>
     </message>
@@ -12393,7 +13565,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12403,12 +13575,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Недоступен</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Редактировать личность</translation>
@@ -12419,27 +13586,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Обновить</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12459,7 +13626,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,7 +13636,11 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Ошибка при получении ключа!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Ошибка: недействительный идентификатор ключа</translation>
     </message>
@@ -12484,7 +13655,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Неизвестное имя</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Создать новую личность</translation>
     </message>
@@ -12494,15 +13665,10 @@ These identities will soon be not supported anymore.</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12528,7 +13694,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Создать</translation>
     </message>
@@ -12538,13 +13704,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Нажмите здесь, чтобы изменить аватар</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Установить аватар</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>Привязан к моему профилю</translation>
     </message>
@@ -12554,7 +13724,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Вы можете иметь один или несколько идентификаторов. Они используются, когда вы пишете в чате лобби, на форумах и канале комментариев. Они выступают в качестве получателя для удалённого чата и удалённой почтовой системы Retroshare.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Псевдоним является слишком коротким. Пожалуйста, введите по крайней мере %1 символов.</translation>
     </message>
@@ -12613,6 +13783,10 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>PGP-псевдоним:</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">Идентификатор GXS:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12628,7 +13802,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
@@ -12638,12 +13812,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Отметить всё</translation>
     </message>
@@ -12662,38 +13836,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Цитата</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Отправить</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Сохранить изображение</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Невозможно сохранить изображение, неверное имя файла</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation>Не является изображением</translation>
     </message>
@@ -12711,32 +13873,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Порт:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Статус:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12757,12 +13914,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12771,31 +13923,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Открыть папку</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Проверка...</translation>
     </message>
@@ -12805,7 +13952,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Проверить файлы</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation>Рекомендовать в сообщении для...</translation>
     </message>
@@ -12833,7 +13980,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Добавить контакт</translation>
     </message>
@@ -12849,8 +13996,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Параметры</translation>
     </message>
@@ -12871,7 +14017,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
@@ -12882,12 +14028,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Помощник быстрого старта</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 — безопасная децентрализованная коммуникационная платформа</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Ещё не готово</translation>
     </message>
@@ -12916,12 +14062,11 @@ RetroShare безопасно приостановит доступ диска 
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Уведомить</translation>
     </message>
@@ -12932,35 +14077,31 @@ RetroShare безопасно приостановит доступ диска 
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Открыть почту</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>График пропускной способности</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Программа</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Свернуть</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Развернуть</translation>
     </message>
@@ -12975,12 +14116,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 новое сообщение</translation>
     </message>
@@ -13010,7 +14146,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>%1 узлов сети соединено</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Вы действительно хотите выйти из RetroShare?</translation>
     </message>
@@ -13030,7 +14166,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Показать</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Убедитесь, что эта ссылка не была подделана, чтобы перенаправить вас на вредоносный веб-сайт.</translation>
     </message>
@@ -13075,13 +14211,12 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Управление правами доступа</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Статистика функционирования</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Показать веб-интерфейс</translation>
     </message>
@@ -13096,7 +14231,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>не хватает места в данной папке (текущий лимит</translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>Хотите выйти?</translation>
     </message>
@@ -13105,17 +14240,17 @@ RetroShare безопасно приостановит доступ диска 
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Составить</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Абзац</translation>
     </message>
@@ -13151,12 +14286,12 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Заголовок 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Увеличить размер шрифта</translation>
     </message>
@@ -13171,32 +14306,32 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Полужирный</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Курсив</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Выравнивание</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Добавить изображение</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Установка шрифта для стиля кода</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Подчёркнутый</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Тема:</translation>
     </message>
@@ -13207,32 +14342,32 @@ RetroShare безопасно приостановит доступ диска 
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>Список адресов</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation>Рекомендовать этого доверенного участника</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Задать цвет текста</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Задать цвет фона текста</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Рекомендованные файлы</translation>
     </message>
@@ -13302,7 +14437,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Добавить цитату</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Отправить: </translation>
     </message>
@@ -13326,6 +14461,10 @@ RetroShare безопасно приостановит доступ диска 
         <source>&amp;Justify</source>
         <translation>По ширине</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">Все адреса (смешано)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13337,7 +14476,7 @@ RetroShare безопасно приостановит доступ диска 
         <translation>Мои контакты</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Здравствуйте, &lt;br&gt;я рекомендую вам один из моих лучших контактов. Вы можете доверять ему ровно настолько, насколько вы доверяете мне. Это хороший узел, поверьте.&lt;br&gt;</translation>
     </message>
@@ -13357,18 +14496,18 @@ RetroShare безопасно приостановит доступ диска 
         <translation>желает установить с вами соединение</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Наилучшие пожелания %1,&lt;br&gt;&lt;br&gt;%2 хочет установить с вами соединение.&lt;br&gt;&lt;br&gt;Откликнитесь, пожалуйста:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Это в интересах всей сети.&lt;br&gt;Команда разработчиков RetroShare</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Сохранить сообщение</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Сообщение не отправлено.
@@ -13380,17 +14519,7 @@ Do you want to save message to draft box?</source>
         <translation>Вставить ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Добавить к &quot;кому&quot;</translation>
     </message>
@@ -13410,7 +14539,7 @@ Do you want to save message to draft box?</source>
         <translation>Добавить как рекомендацию</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Оригинал сообщения</translation>
     </message>
@@ -13420,21 +14549,21 @@ Do you want to save message to draft box?</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Кому</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Копия</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Отправлено</translation>
     </message>
@@ -13449,7 +14578,7 @@ Do you want to save message to draft box?</source>
         <translation>%1 %2 написал(а):</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Ответ:</translation>
     </message>
@@ -13459,30 +14588,30 @@ Do you want to save message to draft box?</source>
         <translation>Перенаправление:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Отправить сообщение без темы?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Пожалуйста, укажите хотя бы одного получателя</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Невидимая копия</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
@@ -13597,13 +14726,13 @@ Do you want to save message to draft box?</source>
         <translation>Подробности</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Открыть файл...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-файлы (*.htm *.html);;Все файлы (*)</translation>
     </message>
@@ -13623,7 +14752,7 @@ Do you want to save message to draft box?</source>
         <translation>Экспорт PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Сообщение не отправлено.
@@ -13645,7 +14774,7 @@ Do you want to save message ?</source>
         <translation>Добавить файл</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Привет, &lt;br&gt;Есть предложение обменяться сертификатами друг с другом. Не возражаете?&lt;br&gt;</translation>
     </message>
@@ -13669,24 +14798,28 @@ Do you want to save message ?</source>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">Вы получили предложение на соединение с действующим узлом RetroShare</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Ответить сейчас:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Из:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>Доверенные узлы сети</translation>
     </message>
@@ -13731,13 +14864,13 @@ Do you want to save message ?</source>
         <translation>Отсортированный список (в римской системе по убыванию)</translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Спасибо, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Удалённая личность:</translation>
     </message>
@@ -13747,12 +14880,12 @@ Do you want to save message ?</source>
         <translation>[Отсутствует]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Пожалуйста, создайте личность для подписи отдалённых сообщений или удалите отдалённых участников из списка назначения.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Имя и идентификатор узла:</translation>
     </message>
@@ -13830,7 +14963,7 @@ Do you want to save message ?</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Новая вкладка</translation>
     </message>
@@ -13840,7 +14973,7 @@ Do you want to save message ?</source>
         <translation>Новое окно</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Изменить метку</translation>
     </message>
@@ -13863,7 +14996,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Тема:</translation>
     </message>
@@ -13871,7 +15004,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
@@ -13899,7 +15032,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Рекомендованные файлы</translation>
     </message>
@@ -13909,37 +15042,37 @@ Do you want to save message ?</source>
         <translation>Скачать все рекомендованные файлы</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Тема:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Из:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>В:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Копия:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Невидимая копия:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Метки:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Ответ</translation>
     </message>
@@ -13979,7 +15112,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>Послать приглашение</translation>
     </message>
@@ -14031,7 +15164,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Установить соединение с %1</translation>
     </message>
@@ -14041,12 +15174,12 @@ Do you want to save message ?</source>
         <translation>Добавить %1 в моё окружение</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Без темы</translation>
     </message>
@@ -14056,22 +15189,17 @@ Do you want to save message ?</source>
         <translation>Скачать</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14081,23 +15209,21 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
+        <source>Send invite?</source>
+        <translation type="vanished">Послать приглашение</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Отправить приглашение с вашим сертификатом?</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Скачать всё</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Распечатать документ</translation>
     </message>
@@ -14112,12 +15238,12 @@ Do you want to save message ?</source>
         <translation>HTML-файлы (*.htm *.html);;Все файлы (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Загружать изображения всегда для этого сообщения</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Скрыть панель вложений</translation>
     </message>
@@ -14139,6 +15265,42 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Составить</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Ответить на сообщение</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Ответ</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Ответить всем на данное сообщение</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Ответить всем</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Переслать выбранные сообщения</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Вперёд</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Удалить выделенное сообщение</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Удалить</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Напечатать данное сообщение</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14217,7 +15379,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Новое сообщение </translation>
     </message>
@@ -14227,16 +15389,60 @@ Do you want to save message ?</source>
         <translation>Составить</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Ответить на сообщение</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Ответ</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Ответить всем на выделенное сообщение</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Ответить всем</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Переслать выбранные сообщения</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Переслать</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Удалить выделенное сообщение</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Удалить</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Напечатать данное сообщение</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Печать</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Показать</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Метки</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Входящие</translation>
@@ -14266,17 +15472,21 @@ Do you want to save message ?</source>
         <translation>Корзина</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Все входящие:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Папки</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Быстрый просмотр</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Печать...</translation>
@@ -14286,6 +15496,26 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>Предварительный просмотр</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Только кнопки</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Текст рядом с кнопкой</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Кнопки с текстом</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Текст под кнопками</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Установить текст под кнопкой</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14307,7 +15537,7 @@ Do you want to save message ?</source>
         <translation>Переслать сообщение</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Тема</translation>
     </message>
@@ -14317,7 +15547,7 @@ Do you want to save message ?</source>
         <translation>От</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
@@ -14327,7 +15557,39 @@ Do you want to save message ?</source>
         <translation>Содержимое</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Сортировка по вложенным файлам</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Сортировка по темам</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Сортировка по прочитанным сообщениям</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Сортировка по отправителю</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Сортировка по дате</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Сортировка по меткам</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Сортировка по звёздам</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Переслать выбранное сообщение</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Поиск темы</translation>
     </message>
@@ -14336,11 +15598,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Поиск отправителя</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14367,14 +15624,14 @@ Do you want to save message ?</source>
         <translation>Поиск вложений</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Сообщения&lt;/h1&gt; &lt;p&gt;В RetroShare имеется собственный почтовый сервис. Вы можете отправлять/получать письма в пределах доверенного окружения.&lt;/p&gt; &lt;p&gt;Благодаря глобальной системе маршрутизации данных, возможна рассылка писем другим участникам сети. Эти сообщения 	всегда подвергаются шифрованию и передаются адресату через промежуточные узлы сети. &lt;/p&gt;	&lt;p&gt;Для надёжной идентификации отправителя рекомендуется криптографически подписывать сообщения, используя 	the &lt;img width=&quot;16&quot; src=&quot;:/images/stock_signature_ok.png&quot;/&gt; кнопку 	в редакторе сообщений. Сообщения удалённым пользователям остаются в папке &quot;Исходящие&quot; до тех пор, пока не будет получено подтверждение в получении.&lt;/p&gt; &lt;p&gt;Почтовый сервис RetroShare может быть использован для передачи ссылок на файлы или рекомендаций по включению в круг доверенных, что укрепит вашу сеть, а также для откликов на объявления в каналах.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Отмечено звездой</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14448,7 +15705,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14462,7 +15719,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14477,33 +15734,38 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Черновики</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Кому</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Нет оценённых сообщений. Оценка сообщений присваивает им специальный статус для последующего удобного поиска и ранжирования. Чтобы оценить сообщение щёлкните на звезду серого цвета рядом с ним.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Системные сообщения отсутствуют.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Кому</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Нажмите, чтобы отсортировать по получателю</translation>
+    </message>
+    <message>
+        <source>This message goes to a distant person.</source>
+        <translation type="vanished">Это сообщение будет отправлено удалённому участнику.</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14511,6 +15773,26 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Всего:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Почта</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Нажмите, чтобы отсортировать по подписи</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Это сообщение было подписано и подпись проверена</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Это сообщение было подписано, но подпись не была проверена  </translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">Это сообщение пришло от удалённых лиц.</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14538,17 +15820,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">Сохранить изображение</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Вставить как простой текст</translation>
     </message>
@@ -14602,7 +15874,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Развернуть</translation>
     </message>
@@ -14612,7 +15884,7 @@ Do you want to save message ?</source>
         <translation>Удалить объект</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation>от </translation>
     </message>
@@ -14647,10 +15919,18 @@ Do you want to save message ?</source>
         <translation>Ожидающее сообщение</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Спрятать</translation>
     </message>
+    <message>
+        <source>Send invite?</source>
+        <translation type="vanished">Послать приглашение</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Отправить приглашение с вашим сертификатом?</translation>
+    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -14788,7 +16068,7 @@ Do you want to save message ?</source>
         <translation>Идентификатор участника</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Удалить неиспользуемые ключи...</translation>
     </message>
@@ -14798,7 +16078,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Чистый массив ключей</translation>
     </message>
@@ -14816,13 +16096,7 @@ Notes: Your old keyring will be backed up.
 При удалении может произойти сбой, если на одном компьютере запущено несколько экземпляров RetroShare.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Информация о массиве ключей</translation>
@@ -14858,13 +16132,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Несоответствие данных в хранилище ключей. Вероятнее всего, это ошибка. Пожалуйста, свяжитесь с разработчиками.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>Экспортировать/создать новый узел</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Только доверенные ключи</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Поиск по имени</translation>
     </message>
@@ -14874,12 +16153,12 @@ For security, your keyring was previously backed-up to file
         <translation>Поиск идентификатора участника</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>Сведения о профиле...</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14888,6 +16167,13 @@ Reported error:</source>
 Сообщение о ошибке: </translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Сеть</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14914,107 +16200,107 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
-        <translation>Друзья офлайн</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show Offline Friends</source>
-        <translation>Показать друзей офлайн</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Status</source>
-        <translation>Статус</translation>
+        <translation type="unfinished">Статус</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show status</source>
-        <translation>Показать статус</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
-        <translation>Группы</translation>
+        <translation type="unfinished">Группы</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Show groups</source>
-        <translation>Показать группы</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>export friendlist</source>
-        <translation>Экспорт списка контактов</translation>
+        <translation type="unfinished">Экспорт списка контактов</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>export your friendlist including groups</source>
-        <translation>Экспорт списка контактов, включая информацию о группах</translation>
+        <translation type="unfinished">Экспорт списка контактов, включая информацию о группах</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>import friendlist</source>
-        <translation>Импорт списка контактов</translation>
+        <translation type="unfinished">Импорт списка контактов</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>import your friendlist including groups</source>
-        <translation>Импорт списка контактов, включая информацию о группах</translation>
+        <translation type="unfinished">Импорт списка контактов, включая информацию о группах</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
-        <translation>Поиск</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
-        <translation>Поиск идентификатора</translation>
+        <translation type="unfinished">Поиск идентификатора</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Online friends on top</source>
-        <translation>Онлайн-друзья наверху</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
-        <translation>Показать...</translation>
+        <translation type="unfinished">Показать...</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
-        <translation>Последний контакт</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+7"/>
         <source>IP</source>
-        <translation>IP</translation>
+        <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
-        <translation>Группа</translation>
+        <translation type="unfinished">Группа</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Friend</source>
-        <translation>Друг</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Node</source>
-        <translation>Узел</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -15024,126 +16310,126 @@ Reported error:</source>
     <message>
         <location line="+12"/>
         <source>Edit Group</source>
-        <translation>Редактировать группу</translation>
+        <translation type="unfinished">Редактировать группу</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Remove Group</source>
-        <translation>Удалить группу</translation>
+        <translation type="unfinished">Удалить группу</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Profile details</source>
-        <translation>Сведения об узле</translation>
+        <translation type="unfinished">Сведения об узле</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Deny connections</source>
-        <translation>Запретить соединения</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Add to group</source>
-        <translation>добавить в группу</translation>
+        <translation type="unfinished">добавить в группу</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Move to group</source>
-        <translation>Переместить в группу</translation>
+        <translation type="unfinished">Переместить в группу</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Create new group</source>
-        <translation>Создать новую группу</translation>
+        <translation type="unfinished">Создать новую группу</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Remove from group </source>
-        <translation>Удалить из группы </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Remove from all groups</source>
-        <translation>Удалить из всех групп</translation>
+        <translation type="unfinished">Удалить из всех групп</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Chat</source>
-        <translation>Чат</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Send message to this node</source>
-        <translation>Послать сообщение этому узлу</translation>
+        <translation type="unfinished">Послать сообщение этому узлу</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Node details</source>
-        <translation>Сведения об узле</translation>
+        <translation type="unfinished">Сведения об узле</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Recommend this node to...</source>
-        <translation>Рекомендовать этого участника...</translation>
+        <translation type="unfinished">Рекомендовать этого участника...</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Attempt to connect</source>
-        <translation>Соединиться</translation>
+        <translation type="unfinished">Соединиться</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Copy certificate link</source>
-        <translation>Скопировать ссылку сертификата</translation>
+        <translation type="unfinished">Скопировать ссылку сертификата</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Remove Friend Node</source>
-        <translation>Удалить этого участника</translation>
+        <translation type="unfinished">Удалить этого участника</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Paste certificate link</source>
-        <translation>Вставить ссылку на сертификат</translation>
+        <translation type="unfinished">Вставить ссылку на сертификат</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Expand all</source>
-        <translation>Раскрыть всё</translation>
+        <translation type="unfinished">Раскрыть всё</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Collapse all</source>
-        <translation>Свернуть всё</translation>
+        <translation type="unfinished">Свернуть всё</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
-        <translation>Вы хотите удалить этот узел?</translation>
+        <translation type="unfinished">Вы хотите удалить этот узел?</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Do you want to remove this Friend?</source>
-        <translation>Вы хотите удалить этот контакт?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
-        <translation>Готово!</translation>
+        <translation type="unfinished">Готово!</translation>
     </message>
     <message>
         <location line="-17"/>
         <source>Your friendlist is stored at:
 </source>
-        <translation>Ваш список список контактов сохранён в:
+        <translation type="unfinished">Ваш список список контактов сохранён в:
 </translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 (keep in mind that the file is unencrypted!)</source>
-        <translation>
+        <translation type="unfinished">
 (помните, что файл не зашифрован!)</translation>
     </message>
     <message>
@@ -15151,32 +16437,32 @@ Reported error:</source>
         <location line="+7"/>
         <source>Your friendlist was imported from:
 </source>
-        <translation>Ваш список контактов импортирован из:
+        <translation type="unfinished">Ваш список контактов импортирован из:
 </translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Done - but errors happened!</source>
-        <translation>Выполнено, но с ошибками!</translation>
+        <translation type="unfinished">Выполнено, но с ошибками!</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>
 at least one peer was not added</source>
-        <translation>
+        <translation type="unfinished">
 как минимум один участник не добавлен</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>
 at least one peer was not added to a group</source>
-        <translation>
+        <translation type="unfinished">
 как минимум один участник не добавлен в группу</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Select file for importing your friendlist from</source>
-        <translation>Выберите файл, в котором хранится список ваших контактов</translation>
+        <translation type="unfinished">Выберите файл, в котором хранится список ваших контактов</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -15193,7 +16479,7 @@ at least one peer was not added to a group</source>
         <location line="+30"/>
         <location line="+116"/>
         <source>Error</source>
-        <translation>Ошибка</translation>
+        <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
         <location line="-115"/>
@@ -15241,7 +16527,11 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">Журнал</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15256,7 +16546,11 @@ at least one peer was not added to a group</source>
         <translation>Очистить всё</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Это проверка.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>Новые наверху</translation>
     </message>
@@ -15266,12 +16560,20 @@ at least one peer was not added to a group</source>
         <translation>Старые наверху</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Новостная лента&lt;/h1&gt; &lt;p&gt;Лента новостей отображает последние события вашей сети в порядке получения. Можно настроить какие виды событий отображать в журнале, нажав &lt;b&gt;Параметры&lt;/b&gt;. &lt;/p&gt; &lt;p&gt;События могут быть следующими: &lt;ul&gt; &lt;li&gt;попытка соединения (полезно для пополнения вашего окружения новыми доверенными участниками и отслеживания тех участников, которые пытаются к вам подключиться)&lt;/li&gt; &lt;li&gt;появление сообщений в форумах и каналах&lt;/li&gt; &lt;li&gt;появление новых форумов или каналов&lt;/li&gt; &lt;li&gt;личные сообщения от ваших контактов&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="vanished">Журнал</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15326,6 +16628,10 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Блоги</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Безопасность</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15347,6 +16653,10 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Попытка соединения</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15363,6 +16673,10 @@ at least one peer was not added to a group</source>
         <source>Ip security</source>
         <translation>IP-безопасность</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">Журнал</translation>
+    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -15373,6 +16687,10 @@ at least one peer was not added to a group</source>
         <source>Circles</source>
         <translation>Круги</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Публикации</translation>
+    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -15425,6 +16743,26 @@ at least one peer was not added to a group</source>
         <source>Chat rooms</source>
         <translation>Чат-комнаты</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">Чаты</translation>
+    </message>
+    <message>
+        <source>Count occurrences of my current identity</source>
+        <translation type="vanished">Подсчёт нахождений моей текущей личности</translation>
+    </message>
+    <message>
+        <source>Count occurrences of any of the following texts (separate by newlines):</source>
+        <translation type="vanished">Подсчёт нахождений любых нижеследующих фрагментов текста (каждый с новой строки):</translation>
+    </message>
+    <message>
+        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
+        <translation type="vanished">Отметьте, если для подсчёта должны одновременно присутствовать и личность, и текст выше.</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="vanished">Учитывать регистр</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15500,16 +16838,24 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation>Временно отключить все всплывающие уведомления</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Канал</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Панель уведомлений</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">Подсчёт всех непрочитанных сообщений</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation>Требуется ключевая фраза</translation>
     </message>
@@ -15529,12 +16875,12 @@ at least one peer was not added to a group</source>
         <translation>Неверный пароль!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Пожалуйста, введите ваш пароль для PGP-ключа</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Незарегистрированный плагин/исполняемый файл.</translation>
     </message>
@@ -15549,7 +16895,19 @@ at least one peer was not added to a group</source>
         <translation>Пожалуйста, проверьте ваши системные часы.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Проверка файлов, открытых к доступу...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Хеширование файла</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Сохранение списка файлов...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Тест</translation>
     </message>
@@ -15560,19 +16918,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Неизвестный заголовок</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Шифрованное сообщение</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Для надлежащей работы чата требуется, чтобы системное время компьютера было точным. Пожалуйста, проверьте его. (Смещение системного времени в несколько минут может нарушить общение с другими участниками сети.)</translation>
     </message>
@@ -15580,7 +16936,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Успешное соединение с узлом сети!</translation>
     </message>
@@ -15633,6 +16989,10 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Диалоговое окно</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15698,6 +17058,10 @@ at least one peer was not added to a group</source>
         <source>This profile has signed your own profile key</source>
         <translation>Этот ключ подписан вашим собственным PGP-ключом</translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Ключ подписи:</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15727,20 +17091,23 @@ p, li { white-space: pre-wrap; }
         <translation>PGP-ключ</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation>Эти опции применяются для всех местоположений, привязанных к профилю: </translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Механизм подписания ключей может оказаться полезным другим участникам сети, которые, добавляя чужой сертификат в своё окружение, имеют возможность посмотреть, кто подписал ключ в сертификате. Следует отметить, что подписание чужих ключей не является обязательным и не может быть впоследствии отменено. Поэтому подходите к вопросу подписания, взвесив все «за» и «против».&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Подписать PGP-ключ</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15777,7 +17144,12 @@ p, li { white-space: pre-wrap; }
         <translation>Вставить подписи</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Параметры</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare периодически проверяет папки ваших контактов, доступные вам к просмотру, на предмет наличия там интересующего вас файла. Если файл находится, в целях скачивания с контактом устанавливается прямое соединение – не через систему анонимных туннелей. В этом случае узел-источник из вашего окружения достоверно знает, что файл качаете именно вы – пользователь с конкретным сертификатом.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Чтобы исключить такого рода небезопасное поведение вашего клиент-сервера, снимите здесь галочку. Отметим, что прямое соединение всё равно установится, если вы напрямую выберете в открытой к просмотру папке файл для скачивания. Включение/отключение возможности прямого соединения при файлообмене применяется ко всем местоположениям одного узла.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -15791,6 +17163,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Эта опция позволяет вам автоматически скачивать рекомендованный в сообщении файл, если само сообщение поступило от конкретного узла сети. Такой подход может оказаться весьма удобным, например, когда вы пересылаете файлы с одного узла, принадлежащего вам, на другой. Применяется ко всем местоположениям, привязанным к конкретному сертификату.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15823,21 +17199,21 @@ p, li { white-space: pre-wrap; }
         <translation> кБ/с</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Ошибка: не могу получить совокупность деталей.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Предоставленный алгоритм ключа не поддерживается RetroShare 
@@ -15856,7 +17232,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Предупреждение: в настройках файлообмена вы запретили прямую загрузку.</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Уровень доверия является способом выразить доверие в этом ключе. Он не используется сторонним программным обеспечением, но может быть полезным для вас, чтобы запомнить хорошие/плохие ключи.</translation>
     </message>
@@ -15925,6 +17301,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Может быть, неправильный пароль</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15932,12 +17312,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>Профиль RetroShare</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Это ваш собственный ключ PGP и он подписан: </translation>
     </message>
@@ -15963,7 +17343,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Чат</translation>
     </message>
@@ -15984,7 +17364,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Удалить объект</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -16024,7 +17404,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Смещение времени:</translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Написать сообщение</translation>
     </message>
@@ -16038,6 +17418,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Соединение установлено</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Попытка соединения</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16076,13 +17460,17 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Неизвестный участник</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Спрятать</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Отправить сообщение</translation>
     </message>
@@ -16134,6 +17522,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Chat with this person as...</source>
         <translation>Инициировать чат с этим человеком от имени...</translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">Послать сообщение</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -16192,6 +17584,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если не указано иное, любому участнику из вашего окружения будет автоматически присвоена положительная репутация.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
+        <translation type="vanished">давать положительный голос каждому из моего окружения</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -16249,6 +17645,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Для того, чтобы предотвратить активность заблокированных личностей в форумах или каналах, информация о них некоторое время должна храниться. После этого они &amp;quot;удаляются&amp;quot; из списка блокировки, скачиваются снова как незаблокированные и могут участвовать форумах, чатах и т.п.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Форма</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16256,11 +17659,23 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Фото</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Комментарий</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Резюме</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16321,6 +17736,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Добавить комментарий</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Напишите комментарий...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16391,6 +17814,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Создать альбом</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Просмотреть альбом</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16412,17 +17839,17 @@ p, li { white-space: pre-wrap; }
         <translation>Слайд-шоу</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Мои альбомы</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Подписанные альбомы</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Общие альбомы</translation>
     </message>
@@ -16452,7 +17879,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Название альбома</translation>
     </message>
@@ -16511,19 +17938,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16559,12 +17986,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Текстовая метка</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Показать подробности об этом плагине</translation>
     </message>
@@ -16710,6 +18137,60 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Папки поиска плагинов</translation>
     </message>
+    <message>
+        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
+        <translation type="vanished">Плагин отключён. Нажмите кнопку &quot;Включить&quot; и перезапустите RetroShare</translation>
+    </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[отключено]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Нет номера API. Пожалуйста, прочитайте руководство по разработке плагинов.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[проблема загрузки]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Нет номера SVN. Пожалуйста, прочитайте руководство по разработке плагинов.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Ошибка загрузки.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Пропущен символ. Неправильная версия?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Плагин отсутствует</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Плагины загружены.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Неизвестное состояние.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Плагины, находящиеся в стадии разработки, требуют проверки.
+Они не могут быть проверены по хэш-сумме, однако в обычной
+ситуации проверка хэш-суммы защищает вас от злонамеренных
+действий, осуществляемых подменёнными плагинами.</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;&lt;p&gt;Плагины загружаются из каталогов, перечисленных в нижней части списка.&lt;/p&gt;&lt;p&gt;По соображениям безопасности, разрешённые плагины загружаются автоматически до главного исполняемого файла RetroShare или изменения библиотеки плагинов. В таком случае, пользователь должен подтвердить их снова. После запуска программы, вы можете включить плагин вручную, нажав на кнопку &quot;Включить&quot; и перезагрузить RetroShare.&lt;/p&gt;    &lt;p&gt;Если вы хотите разрабатывать свои собственные плагины, свяжитесь с командой Разработчиков, они будут рады помочь вам!&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16779,27 +18260,12 @@ p, li { white-space: pre-wrap; }
         <translation>Разместить окно сверху</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">Заблокировать этого участника (устанавливает отрицательную репутацию)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished">Установить нейтральное мнение</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished">Установить положительное мнение</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16833,6 +18299,22 @@ p, li { white-space: pre-wrap; }
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The person you are talking to has deleted the secured chat tunnel.</source>
+        <translation type="vanished">Собеседник, с которым вы общались, удалил защищённый туннель чата.</translation>
+    </message>
+    <message>
+        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
+        <translation type="vanished">Собеседник удалил защищённый туннель, сообщения будут доставлены как только появится возможность</translation>
+    </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Закрытие этого окна приведёт к завершению разговора, уведомлению участника и удалению шифрованного туннеля.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Удалить тоннель?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16852,7 +18334,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Новый</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Голосовать &quot;за&quot;</translation>
     </message>
@@ -16872,8 +18354,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Комментарии</translation>
     </message>
@@ -16898,13 +18380,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Комментарий</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished">Комментарии </translation>
     </message>
@@ -16932,12 +18414,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Подписан: </translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Примечания</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16952,22 +18442,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Загрузить файл изображения</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16983,17 +18463,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17003,7 +18473,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Отправить сообщение</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">Вы отправляете ссылку. Ключ к успешной презентации — это интересное содержание и информативное название.</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Отправить</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Отправить новое сообщение</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Пожалуйста, добавьте заголовок</translation>
     </message>
@@ -17023,22 +18509,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17053,7 +18529,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Отправить как</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17064,7 +18540,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Изображение</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17074,7 +18550,7 @@ p, li { white-space: pre-wrap; }
         <translation>Название</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Ссылка</translation>
     </message>
@@ -17082,12 +18558,44 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Опубликованное</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Ссылки&lt;/h1&gt; &lt;p&gt;Сервис «Ссылки» даёт Вам возможность поделиться с окружением полезными ссылками, информация о которых будет распространяться по сети как форумы ⇥ каналы&lt;/p&gt; ⇥ &lt;p&gt;Ссылки могут комментироваться подписчиками. Система продвижения сообщений даёт возможность ⇥ информировать о важных ссылках.&lt;/p&gt; ⇥ &lt;p&gt;Ограничения на тип и характер публикуемых ссылок отсутствует; будьте осторожны при переходах по ним.&lt;/p&gt; &lt;р&gt; Размещенные ссылки удаляются через %1 месяца. &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Создать тему</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Мои темы</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Подписка на темы</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Популярные темы</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Другие темы</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Публикации</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17121,7 +18629,31 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Опубликованная тема</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Добавить администраторов темы</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Выбрать администраторов темы</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Создать новую тему</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Изменить тему</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Обновить тему</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17159,17 +18691,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Текстовая метка</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>Подписаться на сообщения</translation>
     </message>
@@ -17185,7 +18707,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Раскрыть</translation>
     </message>
@@ -17200,17 +18722,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">Описание канала ссылок</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Загрузка</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">Новые сообщения</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">Никогда</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17223,18 +18752,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Сайт</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Комментарии</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
@@ -17245,12 +18778,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Комментарий</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished">Комментарии </translation>
     </message>
@@ -17260,7 +18793,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Автор этого сообщения (личность %1) заблокирован.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17270,17 +18803,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Голосовать &quot;за&quot;</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Голосовать &quot;против&quot;</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Установить как чтение и удаление элемента</translation>
     </message>
@@ -17290,7 +18827,7 @@ p, li { white-space: pre-wrap; }
         <translation>Новый</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Новый комментарий:</translation>
     </message>
@@ -17300,7 +18837,7 @@ p, li { white-space: pre-wrap; }
         <translation>Значение комментария</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
@@ -17341,10 +18878,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Загрузка</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">По</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Форма</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Горячий</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Новый</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">В начало списка</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Сегодня</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Вчера</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">На этой неделе</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">В этом месяце</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">В этом году</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Отправить новое сообщение</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Следующий</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Пожалуйста, создайте или выберите идентификатор подписавшего до голосования</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Предыдущий</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17364,17 +18968,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17384,15 +18978,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Администратор:</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished">Распространение:</translation>
     </message>
@@ -17402,42 +18996,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished">Текстовая метка</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">Сообщения</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17457,7 +19051,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Горячий</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17487,17 +19081,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17512,17 +19106,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Пусто</translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Скопировать ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17532,31 +19121,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished">информация</translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17571,7 +19156,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Подписаться</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">Никогда</translation>
     </message>
@@ -17623,12 +19208,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished">Ограничено для членов круга &quot;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished">Ограничено для членов круга </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
@@ -17645,16 +19230,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Не выбраны каналы</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17663,6 +19238,14 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Открывать каждое сообщение в новой вкладке</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Публикации</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17676,6 +19259,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Сообщения</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17744,17 +19331,25 @@ p, li { white-space: pre-wrap; }
         <translation>Управление профилями</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&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;
+&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;Ubuntu&apos;; font-size:11pt; 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;Выберите ключ узла Retroshare из приведённого ниже списка, который будет использоваться на другом компьютере, и нажмите &quot;Экспортировать выбранный ключ&quot;.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Чтобы создать новое местоположение на другом компьютере, выберите &quot;Новый профиль/узел&quot; в окне входа в систему. Оттуда вы сможете импортировать файл ключа и создать для него новое местоположение. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+35"/>
@@ -17865,7 +19460,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Изменить ваш статус</translation>
@@ -17881,7 +19476,7 @@ and use the import button to load it</source>
         <translation>Управление профилями</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Публичная информация</translation>
     </message>
@@ -17916,12 +19511,12 @@ and use the import button to load it</source>
         <translation>Подключён с:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Прочее</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Мой адрес</translation>
     </message>
@@ -17965,27 +19560,51 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Сообщение от:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Учётная запись 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Учётная запись 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Учётная запись 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Добавить в Pulse</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">фильтр</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">Ссылка добавлена</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Показать как</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17995,12 +19614,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Из:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18030,13 +19649,13 @@ and use the import button to load it</source>
         <translation type="unfinished">Отрицательное мнение</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18048,22 +19667,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18072,13 +19681,17 @@ and use the import button to load it</source>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Сообщение-импульс для Телеграфа</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18093,24 +19706,34 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Загрузить файл изображения</translation>
+        <source>From</source>
+        <translation type="vanished">От</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Дата</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18121,7 +19744,7 @@ and use the import button to load it</source>
         <translation type="unfinished">Форма</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18140,7 +19763,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18150,7 +19773,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18177,7 +19800,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18187,7 +19810,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18207,7 +19830,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18323,7 +19946,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18331,42 +19954,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18398,7 +20016,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18406,8 +20024,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Подтверждение</translation>
     </message>
@@ -18678,12 +20296,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Сведения об участнике</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Запрос на файл отменён</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Эта версия RetroShare использует OpenPGP-SDK. В качестве побочного эффекта, она не использует системное публичное PGP хранилище, но имеет своё собственное хранилище, которое используется всеми экземплярами RetroShare. &lt;br&gt;&lt;br&gt;Похоже, что вы не имеете такое хранилище, хотя ключи PGP упоминаются учётными записями RetroShare, вероятно, потому, что вы только что обновились до этой новой версии программного обеспечения.</translation>
     </message>
@@ -18714,7 +20332,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Произошла непредвиденная ошибка. Пожалуйста, сообщите &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation>Не удаётся запустить менеджер Tor!</translation>
     </message>
@@ -18750,7 +20368,7 @@ The error reported is:&quot;</source>
         <translation>Не удалось запустить скрытую службу.</translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Множественные копии</translation>
@@ -18772,26 +20390,6 @@ The error reported is:&quot;</source>
 Файл блокировки:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18812,6 +20410,14 @@ The error reported is:&quot;</source>
         <source>End-to-end encrypted conversation established</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tunnel is pending... Messages will be delivered as soon as possible</source>
+        <translation type="vanished">Туннель находится в ожидании... Сообщения будут доставлены как можно скорее</translation>
+    </message>
+    <message>
+        <source>Secured tunnel is working. Messages are delivered immediately!</source>
+        <translation type="vanished">Защищённый туннель функционирует. Сообщения доставляются немедленно!</translation>
+    </message>
     <message>
         <location filename="../gui/common/RsCollection.cpp" line="+0"/>
         <source>The collection file %1 could not be opened.
@@ -18874,7 +20480,7 @@ Reported error is:
         <translation>Транзитный трафик</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>Похоже, у вас имеются узлы, привязанные к DSA-ключам:</translation>
     </message>
@@ -18884,7 +20490,7 @@ Reported error is:
         <translation>К сожалению, на данный момент DSA-ключи не поддерживаются криптоплатформой RetroShare. Все эти узлы не будут задействованы.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>включено</translation>
     </message>
@@ -18894,7 +20500,7 @@ Reported error is:
         <translation>отключено</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>Перенести IP %1 в белый список</translation>
     </message>
@@ -18910,7 +20516,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>%1 секунд назад</translation>
     </message>
@@ -18978,7 +20584,7 @@ Security: no anonymous IDs</source>
 Безопасность: анонимные участники запрещены</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation>Присоединиться к чат-комнате</translation>
     </message>
@@ -19006,7 +20612,7 @@ Security: no anonymous IDs</source>
         <translation>не получается обработать файл XML!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation>Неограниченно</translation>
     </message>
@@ -19186,29 +20792,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Имя</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished">Адрес</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Статус</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19401,6 +20991,10 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation>Нажмите, чтобы возобновить процесс хеширования</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Этот сертификат содержит:</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19451,18 +21045,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19602,7 +21184,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Обширная сеть</translation>
     </message>
@@ -19772,7 +21354,7 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Блокируется загрузка внедрённых изображений.</translation>
     </message>
@@ -19785,7 +21367,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Разрешено по умолчанию</translation>
     </message>
@@ -19958,22 +21540,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">Сохранить изображение</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19981,12 +21553,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation>Настройка древовидного представления</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20016,6 +21588,14 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">Показать столбец...</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[без заголовка]</translation>
+    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -20678,7 +22258,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Имя</translation>
@@ -20799,7 +22379,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
@@ -20819,7 +22399,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20877,7 +22457,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished">Сообщения не будут перенаправляться вашему окружению.</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Отредактированное сообщение ... ]</translation>
     </message>
@@ -20891,6 +22471,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Пропущенное сообщение ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20904,11 +22489,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">От</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20931,18 +22511,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Сортировка по прочитанным сообщениям</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Сортировка по отправителю</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20965,9 +22540,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20988,7 +22561,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Сбрасывает ВСЕ сохранённые настройки RetroShare.</translation>
     </message>
@@ -21049,7 +22622,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Настройки локализации RetroShare.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Не получается открыть файл журнала &apos;%1&apos;: %2</translation>
     </message>
@@ -21070,7 +22643,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Не удалось создать каталог данных: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Редакция</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation>Расширенный режим</translation>
     </message>
@@ -21100,7 +22677,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Информация об использовании графического интерфейса RetroShare</translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>Указан недействительный код языка:</translation>
     </message>
@@ -21118,7 +22695,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Ошибка доступа к реестру, возможно необходимы права администратора.</translation>
@@ -21135,12 +22712,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Введите ключевое слово (не менее 3 символов)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Начать поиск</translation>
     </message>
@@ -21201,7 +22778,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Ключевые слова</translation>
     </message>
@@ -21216,7 +22793,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Поиск идентификатора</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Имя файла</translation>
     </message>
@@ -21316,23 +22893,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Скачать выделенное</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Имя файла</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Скачать</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Скопировать ссылку RetroShare</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Отправить RetroShare-ссылку</translation>
     </message>
@@ -21342,7 +22919,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Скачать</translation>
     </message>
@@ -21379,7 +22956,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Удалить всё</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Папка</translation>
@@ -21390,17 +22967,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Новая RetroShare-ссылка</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Открыть папку</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Создание коллекции...</translation>
     </message>
@@ -21420,7 +22997,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Загрузить из файла коллекции...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Коллекция</translation>
     </message>
@@ -21428,7 +23005,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Сведения об участнике</translation>
     </message>
@@ -21444,22 +23021,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Удалить объект</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>IP-адрес:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Идентификатор участника:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Имя участника:</translation>
     </message>
@@ -21476,7 +23053,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Скрыть</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation>но сообщил:</translation>
     </message>
@@ -21501,8 +23078,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;Это IP-адрес, к которому, как утверждает ваш контакт, он подключён. Если вы только что изменили свой IP-адрес, можно не обращать ванимания на это предупреждение. Если же нет, это означает, что подключение к этому контакту перенаправляется неким промежуточным узлом, что является достаточно подозрительным.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Это предупреждение показывается, чтобы защитить вас от атаки типа «перенаправление трафика». В этом случае контакт, к которому вы подключены не увидит ваш внешний IP-адрес, но увидит IP-адрес злоумышленника. &lt;/p&gt; &lt;p&gt;&lt;br/&gt;&lt;/p&gt; &lt;p&gt;Однако, если вы только что изменили IP-адрес по какой-либо причине (некоторые провайдеры регулярно меняют IP-адреса) это предупреждение просто говорит вам, что друг подключился на новый IP-адрес, прежде чем RetroShare поняла, что IP-адрес изменился. Ничего страшного в этом случае нет.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Ложные предупреждения можно легко отключить, составив белый список ваших собственных IP-адресов (например, диапазон вашего провайдера) или полностью отключить эти предупреждения в опции -&amp;gt; Уведомления -&amp;gt; Журнал.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -21510,7 +23087,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>предлагает установить с вами соединение</translation>
     </message>
@@ -21541,7 +23118,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Развернуть</translation>
     </message>
@@ -21586,12 +23163,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Статус:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Написать сообщение</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Попытка соединения</translation>
     </message>
@@ -21611,22 +23188,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Неизвестная попытка соединения (исходящая)</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Неизвестная проблема безопасности</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21636,7 +23208,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Неизвестный участник</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Спрятать</translation>
     </message>
@@ -21646,7 +23222,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Вы хотите удалить этот узел из вашего окружения?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Сертификат имеет неправильную подпись!!! Этот участник — не тот, за кого он себя выдаёт.</translation>
     </message>
@@ -21656,12 +23232,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Утерян/повреждён сертификат. Не настоящий пользователь Retroshare.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>Сертификат вызвал внутреннюю ошибку.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Участник / узел не находится в доверенном окружении (PGP iD = </translation>
     </message>
@@ -21720,12 +23296,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Локальный адрес</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation>NAT</translation>
     </message>
@@ -21746,22 +23322,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Локальная сеть</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Поисковик внешнего IP-адреса</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Известные/предыдущие IP-адреса:</translation>
     </message>
@@ -21774,16 +23350,21 @@ behind a firewall or a VPN.</source>
         <translation>Если вы снимете этот флажок, RetroShare может определить ваш IP-адрес только при подключении к кому-нибудь. Этот флажок помогает в установлении соединений на начальном этапе, когда у вас мало контактов. Он также помогает, если вы находитесь за межсетевым экраном или используете VPN.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Разрешить RetroShare спрашивать мой IP-адрес у этих сайтов:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>кБ/с</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Диапазон доступных портов: от 1024 до 65535. Обычно порты ниже 1024 зарезервированы операционной системой.</translation>
     </message>
@@ -21793,46 +23374,23 @@ behind a firewall or a VPN.</source>
         <translation>Диапазон доступных портов: от 1024 до 65535. Обычно порты ниже 1024 зарезервированы операционной системой.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Onion-адрес</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Обнаружение включено (рекомендуется)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation>Tor был автоматически настроен Retroshare. Здесь не нужно ничего менять.</translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Обнаружение выключено</translation>
     </message>
@@ -21842,7 +23400,7 @@ List of found external IP:
         <translation>Скрытые - см. конфигурацию</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>Адрес I2P</translation>
     </message>
@@ -21867,95 +23425,41 @@ List of found external IP:
         <translation>Входящие ОК</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>Прокси функционирует.</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P-прокси не включён</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
-        <translation type="unfinished"></translation>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
+        <translation>BOB работает и доступен</translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
-        <translation type="unfinished"></translation>
+        <source>BOB is not accessible! Is it running?</source>
+        <translation>BOB недоступен! Он работает?</translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>RetroShare использует BOB для создания %1 туннеля на %2:%3 (с именем %4)
+
+При изменении параметров (например, порта) используйте кнопки внизу, чтобы перезапустить BOB.
+
+</translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation>клиентского</translation>
     </message>
@@ -21970,7 +23474,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation>BOB обрабатывает запрос</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation>проверка подключения</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation>создание ключа</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation>запуск</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation>завершение работы</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation>BOB обрабатывает запрос: %1</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation>BOB не функционирует</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation>BOB столкнулся с ошибкой: </translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation>BOB-туннель работает</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation>BOB работает нормально: туннель установлен</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation>BOB-туннель не работает</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation>BOB неактивен: туннель закрыт</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation>Запрос нового ключа сервера</translation>
     </message>
@@ -21980,7 +23548,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>Загрузить ключ сервера из base64</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation>Чтобы создать новый ключ, сначала остановите туннель BOB</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation>Чтобы загрузить ключ, сначала остановите туннель BOB</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation>Чтобы отключить BOB, сначала остановите туннель BOB</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Вы доступны через скрытые службы.</translation>
     </message>
@@ -21994,12 +23577,12 @@ Also check your ports!</source>
 Также проверьте порты.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Скрытый режим]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Это очищает список известных IP-адресов, что может оказаться полезным, если по какой-либо причине ваш список адресов содержит недопустимые/ошибочные/недействующие адреса, которые нежелательно передавать контактам из вашего окружения.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22009,7 +23592,7 @@ Also check your ports!</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>Лимит загрузки (КБ/с) </translation>
     </message>
@@ -22024,24 +23607,24 @@ Also check your ports!</source>
         <translation>Лимит отдачи (КБ/с) </translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Лимит выгрузки охватывает всё программное обеспечение. Слишком маленький лимит выгрузки в конечном итоге может заблокировать службы с низким приоритетом (форумы, каналы). Минимально рекомендуемое значение - 50 КБ/с.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation>ПРЕДУПРЕЖДЕНИЕ:
 Эти значения не учитывают трансляторы.</translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22058,7 +23641,17 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
 Вы можете подключиться к скрытым службам, даже если используете стандартный узел, так почему бы не настроить Tor и/или I2P?</translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation>Автоиспользование I2P/BOB</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation>Включить I2P BOB (изменение этого параметра требует перезагрузки для вступления в силу)</translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation>Появляются дополнительные настройки</translation>
     </message>
@@ -22068,7 +23661,12 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
         <translation>Расширенный режим</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation>Основной открытый мост I2P</translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation>Адрес экземпляра I2P</translation>
     </message>
@@ -22078,7 +23676,17 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
         <translation>127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation>Порт I2P-прокси</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation>BOB доступен</translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
@@ -22118,7 +23726,7 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
         <translation>Загрузить ключ</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation>Запуск</translation>
     </message>
@@ -22133,7 +23741,12 @@ Socks-прокси I2P: см. http://127.0.0.1:7657/i2ptunnelmgr для наст
         <translation>Стоп</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation>Статус BOB</translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation>Входящие</translation>
     </message>
@@ -22180,32 +23793,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 Если у вас есть проблемы с подключением через Tor, не забудьте проверить также журналы Tor.</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation>Транслятор</translation>
     </message>
@@ -22260,7 +23848,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Всего:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation>Предупреждение: эта пропускная способность увеличивает максимальную ширину канала.</translation>
     </message>
@@ -22285,7 +23873,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Удалить сервер</translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22299,7 +23887,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>IP-фильтры</translation>
     </message>
@@ -22322,7 +23910,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
@@ -22382,28 +23970,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Добавить в белый список</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Настройка скрытых служб</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Здесь указан socks-порт службы Tor-прокси. Ваш узел RetroShare будет использовать этот порт для соединения со&lt;/p&gt;&lt;p&gt;скрытыми узлами других пользователей. Если служба Tor установлена и правильно настроена, то индикатор слева должен быть зелёного цвета. &lt;/p&gt;&lt;p&gt;Отметим: это не означает, что весь ваш трафик транслируется через сеть Tor. Такое утверждение справедливо &lt;/p&gt;&lt;p&gt;только для скрытых узлов, с которыми вы соединены, или в случае, когда у вас самого скрытый узел.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если служба Tor установлена и правильно настроена, то индикатор слева должен быть зелёного цвета. &lt;/p&gt;&lt;p&gt;Отметим: это не означает, что весь ваш трафик транслируется через сеть Tor. Такое утверждение справедливо &lt;/p&gt;&lt;p&gt;только для скрытых узлов, с которыми вы соединены, или в случае, когда у вас самого скрытый узел.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22419,18 +23996,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Если служба i2p установлена и правильно настроена, то индикатор слева должен быть зелёного цвета. &lt;/p&gt;&lt;p&gt;Это не означает, что весь ваш трафик транслируется через сеть i2p. Такое утверждение справедливо &lt;/p&gt;&lt;p&gt;только для скрытых узлов, с которыми вы соединены, или в случае, когда у вас самого скрытый узел.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>Исходящие I2P ОК</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Адрес службы</translation>
     </message>
@@ -22465,12 +24042,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Пожалуйста, заполните адрес службы</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>Диапазон IP-адресов</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>Получено из DHT; попытка подмены IP-адреса</translation>
     </message>
@@ -22493,22 +24070,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Добавлен вами</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;IP адреса из белого списка собраны из следующих источников: IP адреса поступившие вручную при обмене сертификатами, диапазоны IP, введённые вами в этом окне или в окне безопасности элементов канала.&lt;/p&gt; &lt;p&gt;Поведение по умолчанию для Retroshare: (1) всегда разрешать подключение к участникам с IP из белого списка, даже если этот IP также занесён в чёрный список; (2) дополнительно требуется, чтобы IP адрес находился в белом списке. Вы можете изменить это поведение для каждого участника в окне &quot;Подробности&quot; каждого узла Retroshare. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT позволяет быстро соединяться с доверенными узлами, обрабатывая их поисковые запросы, что значительно упрощает процедуру установления соединения. Никакая информация на самом деле в DHT не хранится. Она используется только в качестве промежуточной системы, позволяющей бстрее установить соединение с другими узлами сети RetroShare.&lt;/p&gt;&lt;p&gt;Сервис обнаружения посылает информацию о местоположении и идентификаторы доверенных узлов всем подключенным участникам, чтобы помочь им в установлении соединения. Найденые контакты не соединяются автоматически; чтобы иметь возможность соединиться, обе стороны должны добавить сертификаты друг друга вручную. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Индикатор становится зелёным, как только Retroshare удаётся получить свой собственный IP от веб-сайтов перечисленных ниже, если вы включили это действие. Retroshare  также будет использовать другие средства, чтобы узнать свой IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Этот список автоматически заполняется информацией, собранной из нескольких источников: ретрансляция участников, информация о которых получена из DHT, диапазоны IP-адресов, введённые вами, а также диапазоны IP-адресов сообщённые вашими друзьями. Параметры по умолчанию должны защитить вас от крупномасштабной ретрансляции трафика.&lt;/p&gt; &lt;p&gt;Автоматический подбор ретранслирующих IP-адресов может привести к тому, что IP-адреса контактов из вашего окружения будут добавлены в чёрный список. В этом случае, используйте контекстное меню, чтобы вернуть их в белый список.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22543,22 +24120,26 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Автоматически запретить диапазон DHT по маске IP, начиная с</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation>Ручная настройка исходящих Tor/I2P</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. &lt;br/&gt;If you prefer to use BOB to automatically manage I2P check the other tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Настройте здесь свои  socks-прокси Tor и I2P. &lt;br/&gt;Если вы предпочитаете использовать BOB для автоматического управления I2P, откройте соседнюю вкладку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+31"/>
         <source>Tor Socks Proxy</source>
         <translation>Socks-прокси Tor</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Исходящие Tor OK</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor-прокси не включён</translation>
     </message>
@@ -22638,7 +24219,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>проверить участников, с которыми вы хотите поделиться приватным ключом</translation>
     </message>
@@ -22648,12 +24229,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Доступен доверенному узлу</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Предоставить общий доступ</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Вы имеете возможность оповестить друзей о канале, предоставив им право публикации.
@@ -22673,7 +24254,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Менеджер доступа к папкам</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation>Доступная папка</translation>
     </message>
@@ -22693,17 +24274,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Доступно</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation>Добавить новую</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Добавить папку для доступа</translation>
     </message>
@@ -22713,7 +24294,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Применить</translation>
     </message>
@@ -22804,7 +24385,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Папка не найдена или неприменимое имя папки.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Это список разделяемых папок. Вы можете добавлять или удалять папки, используя кнопки внизу. Когда вы открываете доступ к папке, всё её содержимое доступно к скачиванию. Вы можете отдельно установить флаги доступа к каждой из разделяемых папок.</translation>
     </message>
@@ -22812,7 +24393,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Файлообмен</translation>
     </message>
@@ -22863,16 +24444,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>проверить файлы</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Скачать выделенное</translation>
     </message>
@@ -22882,7 +24458,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Скачать</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Скопировать RetroShare-ссылки в буфер обмена</translation>
     </message>
@@ -22897,7 +24473,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Отправить RetroShare-ссылки</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation>Некоторые файлы были пропущены</translation>
     </message>
@@ -22913,7 +24489,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Рекомендации</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Создание коллекции...</translation>
     </message>
@@ -22938,7 +24514,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Загрузить из файла коллекции...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation>Некоторые файлы были пропущены, поскольку они ещё не были проиндексированы.</translation>
     </message>
@@ -23081,12 +24657,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Загрузка параметров</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Создание интерфейса</translation>
     </message>
@@ -23110,7 +24686,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Запомнить пароль</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Войти</translation>
     </message>
@@ -23465,7 +25041,7 @@ This choice can be reverted in settings.</source>
         <translation>Статус сообщения</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Сообщение:</translation>
     </message>
@@ -23710,7 +25286,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Удалить все метки</translation>
     </message>
@@ -23746,15 +25322,12 @@ p, li { white-space: pre-wrap; }
         <translation>Настройка Tor...</translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation>Статус Tor:</translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
@@ -23764,13 +25337,18 @@ p, li { white-space: pre-wrap; }
         <translation>Не запущен</translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
-        <translation type="unfinished"></translation>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
+        <translation>Адрес скрытой службы:</translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation>Статус начальной загрузки Tor:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation>Не задан</translation>
     </message>
@@ -23780,57 +25358,12 @@ p, li { white-space: pre-wrap; }
         <translation>Onion-адрес:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Ошибка</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">не соединён</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation>Убедитесь, что Tor находится в одной из папок, доступных для запуска исполняемых файлов</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation>[Ожидание Tor...]</translation>
     </message>
@@ -23838,17 +25371,21 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Эта версия Retroshare использует Tor для подключения к вашим доверенным узлам.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;This version of Retroshare uses Tor to connect to your trusted nodes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation>Tor сейчас недоступен</translation>
     </message>
@@ -23859,12 +25396,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation>Нет конфигурации Tor</translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23892,7 +25428,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Параметры передачи</translation>
@@ -23903,7 +25439,7 @@ p, li { white-space: pre-wrap; }
         <translation>Максимальное количество одновременных закачек:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation>Разделяемые папки</translation>
     </message>
@@ -23913,27 +25449,22 @@ p, li { white-space: pre-wrap; }
         <translation>Автоматически открывать доступ к входящей папке (рекомендуется)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation>Редактировать разделяемые ресурсы</translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished">Настроить разделяемые папки</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation>Автоматические проверять разделяемые папки каждые</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation>минут(-ы)</translation>
     </message>
@@ -24018,7 +25549,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24027,12 +25558,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation>Максимальное количество закачек для участника (0 - неограниченно):</translation>
     </message>
@@ -24057,12 +25583,7 @@ p, li { white-space: pre-wrap; }
         <translation>Разрешить прямую загрузку:</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Последовательный</translation>
     </message>
@@ -24121,13 +25642,30 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Ubuntu&apos;; font-size:11pt; 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-family:&apos;Sans&apos;; font-size:9pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; способна передавать данные и поисковые запросы между участниками сети, не обязательно между собой соединёнными. Однако этот трафик передаётся только через подключённые узлы из вашего окружения и является анонимным.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;В диалоговом окне раздач для каждой папки по отдельности вы можете установить свои флаги с целью обеспечения:&lt;/span&gt;&lt;/p&gt; &lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;обзора папок контактами из вашего окружения&lt;/span&gt;: файлы в папках видимы только вашим доверенным окружением.&lt;/li&gt; &lt;li style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;анонимного доступа&lt;/span&gt;: файлы доступны анонимно через F2F-туннели.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Максимум туннельных запросов, переданных в секунду:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;&lt;span style=&quot;font-weight:600;&quot;&gt; Потоковая&lt;/span&gt; передача файла требует предачи частей в 1 MB в возрастающем порядке, облегчая просмотр во время загрузки. &lt;span style=&quot;font-weight:600;&quot;&gt;Случайная&lt;/span&gt; передача является чисто случайной и напоминает заполнение мозаики. &lt;span style=&quot;font-weight:600;&quot;&gt;Прогрессивная&lt;/span&gt; передача является компромиссом, выбирая следующий фрагмент в случайном порядке в пределах менее чем 50 МБ после окончания загрузки предыдущего фрагмента. Это позволяет некоторые случайности, одновременно сокращая время инициализации большого пустого файла.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Retroshare будет приостанавливать все передачи и сохранение конфигурационного файла, если свободное место на диске ниже этого предела. Это предотвращает потерю информации на некоторых системах. Всплывающее окно предупредит вас, когда это произойдёт.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24137,17 +25675,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Это значение определяет как много туннелей в секунду можно создавать.  &lt;/p&gt;&lt;p&gt;Если у вас быстрое подключение к сети, вы можете повысить это значение до 30-40, Учтите, что это создаёт много мелких пакетов и может сильно замедлить передачу файлов.&lt;/p&gt;&lt;p&gt;Значение по умолчанию - 20. Если вы не уверены, оставьте значение по умолчанию.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Предупреждение</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation>Указать входящую папку</translation>
     </message>
@@ -24175,7 +25703,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Загрузка завершена</translation>
     </message>
@@ -24199,23 +25727,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">У вас %1 завершённых закачек</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">У вас есть %1 завершённая загрузка</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 завершённых закачек</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 завершённых загрузок</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Обмен файлами</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Передача</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Имя</translation>
@@ -24422,7 +25966,11 @@ p, li { white-space: pre-wrap; }
         <translation>Выбрать...</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt; &lt;p&gt;RetroShare поддерживает два метода передачи файлов: прямые передачи между друзьями и анонимные туннельные передачи. Кроме этого поддерживается загрузка от нескольких источников (вы также можете быть источником, пока скачиваете файл)&lt;/p&gt; &lt;p&gt;Есть возможность раздавать свои файлы, воспользуйтесь значком &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=16 /&gt; на панели. Эти файлы будут добавлены в список разделяемых вами ресурсов. Дополнительно вы можете указать доступность этих файлов для ближнего окружения&lt;/p&gt; &lt;p&gt;Вкладка &quot;Поиск&quot; позволяет искать файлы среди доступных ресурсов ваших контактов, а также у удалённых пользователей, через сервис анонимных туннелей.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Переместить в очереди...</translation>
     </message>
@@ -24447,7 +25995,7 @@ p, li { white-space: pre-wrap; }
         <translation>Выберите каталог</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>Анонимный туннель со сквозным шифрованием 0x</translation>
     </message>
@@ -24468,7 +26016,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24501,17 +26049,7 @@ p, li { white-space: pre-wrap; }
         <translation>Файл %1 не завершён. Если это медиафайл, попробуйте предпросмотр</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Предупреждение</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Измените имя файла</translation>
     </message>
@@ -24526,7 +26064,7 @@ p, li { white-space: pre-wrap; }
         <translation>Пожалуйста введите новое--и действительное--имя файла</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Раскрыть всё</translation>
@@ -24653,18 +26191,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Столбцы</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Файлообмен</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Путь</translation>
     </message>
@@ -24674,7 +26217,7 @@ p, li { white-space: pre-wrap; }
         <translation>Показать столбец &quot;Путь&quot;</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>Не удалось удалить файл предварительного просмотра</translation>
     </message>
@@ -24684,7 +26227,7 @@ p, li { white-space: pre-wrap; }
         <translation>Попробуйте ещё раз?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Создание коллекции...</translation>
     </message>
@@ -24699,12 +26242,7 @@ p, li { white-space: pre-wrap; }
         <translation>Просмотр коллекции...</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+193"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Коллекция</translation>
     </message>
@@ -24714,7 +26252,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 туннелей</translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>Анонимный туннель 0x</translation>
     </message>
@@ -24935,6 +26473,10 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">Анонимные туннели</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25128,17 +26670,12 @@ p, li { white-space: pre-wrap; }
         <translation>Форма</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>Включить веб-интерфейс Retroshare</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Статус:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Параметры сети</translation>
     </message>
@@ -25172,33 +26709,35 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port:</source>
+        <translation type="vanished">Порт:</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation>Разрешить доступ от всех IP-адресов (по умолчанию: только localhost)</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <source>Apply setting and start browser</source>
+        <translation type="vanished">Применить настройки и запустить браузер</translation>
+    </message>
+    <message>
+        <source>Note: these settings do not affect retroshare-nogui. Retroshare-nogui has a command line switch to activate the web interface.</source>
+        <translation type="vanished">Примечание: эти настройки не влияют на retroshare-nogui. У Retroshare-nogui есть ключ командной строки для активации веб-интерфейса.</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;Веб-интерфейс&lt;/h1&gt; &lt;p&gt;Веб-интерфейс позволяет управлять Retroshare из браузера. Несколько устройств могут иметь контроль над одним экземпляром Retroshare. Так вы можете начать разговор на планшете и позднее использовать настольный компьютер для его продолжения.&lt;/p&gt; &lt;p&gt;Предупреждение: не оставляйте веб-интерфейс подключённым к интернету, потому что нет никакого контроля доступа и нет шифрования. Если вы хотите использовать веб-интерфейс через интернет, используйте SSH-туннель или прокси-сервер для безопасного соединения.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>Веб-интерфейс не включён</translation>
     </message>
@@ -25208,12 +26747,12 @@ p, li { white-space: pre-wrap; }
         <translation>Веб-интерфейс не включён. Включите его в настройках -&gt; Веб-интерфейс.</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>не удалось запустить веб-интерфейс</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Веб-интерфейс</translation>
     </message>
@@ -25350,7 +26889,11 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki-страницы</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Новая группа</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Название страницы</translation>
     </message>
@@ -25365,7 +26908,7 @@ p, li { white-space: pre-wrap; }
         <translation>Уникальный идентификатор</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25453,7 +26996,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>История редактирования страницы</translation>
     </message>
@@ -25488,7 +27031,7 @@ p, li { white-space: pre-wrap; }
         <translation>Идентификатор страницы</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25518,18 +27061,14 @@ p, li { white-space: pre-wrap; }
         <translation>Метки</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">История</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Показать историю редактирования</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
@@ -25550,7 +27089,7 @@ p, li { white-space: pre-wrap; }
         <translation>Вернуться</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Отправить</translation>
     </message>
@@ -25622,6 +27161,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">Диапазон времени</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25633,7 +27176,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Обновить</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25648,7 +27200,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Другие</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25668,7 +27220,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25698,17 +27250,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Последний месяц</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Последняя неделя</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Сегодня</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Новый</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">от</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">до</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Поиск/Фильтр</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Обширная сеть</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Управление учётными записями</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Показаны:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Себя</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Сетевые узлы</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Следовавший</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Пользовательские</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Учётная запись 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Учётная запись 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Учётная запись 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">Флажок</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Сообщение-импульс для Телеграфа</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25771,42 +27391,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Форма</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25851,41 +27464,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Следовавший</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Неизвестно</translation>
@@ -25963,7 +27546,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 г. %2 дн.</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>к</translation>
@@ -25996,11 +27579,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Изображения (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation> Разрешаете ли вы соединения, подписанные этим ключом?</translation>
     </message>
@@ -26009,6 +27596,10 @@ p, li { white-space: pre-wrap; }
         <source>Name of the profile</source>
         <translation>Имя профиля</translation>
     </message>
+    <message>
+        <source>This column indicates trust level and whether you signed the profile PGP key</source>
+        <translation type="vanished">Этот столбец указывает уровень доверия и подписан ли PGP-ключ профиля</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>This column indicates the trust level you indicated and whether you signed the profile PGP key</source>
@@ -26119,6 +27710,10 @@ p, li { white-space: pre-wrap; }
         <source>Denied</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> - </source>
+        <translation type="vanished"> - </translation>
+    </message>
     <message>
         <location line="+14"/>
         <source>PGP key signed by you</source>
diff --git a/retroshare-gui/src/lang/retroshare_sl.ts b/retroshare-gui/src/lang/retroshare_sl.ts
index 581ac731c..a8c42dad2 100644
--- a/retroshare-gui/src/lang/retroshare_sl.ts
+++ b/retroshare-gui/src/lang/retroshare_sl.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,6 +156,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Kakovost:</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -540,7 +547,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,23 +573,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -625,7 +619,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,7 +706,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ponastavi</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -731,6 +725,14 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Shrani</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Prekliči</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
@@ -808,7 +810,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,12 +840,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -851,7 +853,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -871,7 +873,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -909,7 +911,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -929,7 +931,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -959,7 +961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -969,7 +971,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -977,12 +979,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1002,18 +1004,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1028,12 +1030,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1202,17 +1204,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1222,17 +1224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1232,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1263,7 +1255,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1288,18 +1280,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1314,7 +1306,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -1324,7 +1316,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1332,7 +1334,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -1523,7 +1525,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1556,14 +1558,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1571,13 +1572,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,7 +1588,29 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,7 +1620,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1654,12 +1677,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1669,42 +1692,23 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-564"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1714,25 +1718,38 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Da</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Ne</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1744,47 +1761,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Vrsta:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1799,7 +1816,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Pokaži </translation>
@@ -1819,7 +1836,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1864,7 +1881,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1879,7 +1896,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1899,7 +1916,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1924,7 +1941,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1954,7 +1971,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1964,7 +1981,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +2005,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,22 +2075,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,17 +2090,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2190,7 +2187,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Razlikuj velike in male črke</translation>
     </message>
@@ -2296,7 +2293,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2332,7 +2329,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2367,12 +2364,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,6 +2449,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2489,7 +2491,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2511,7 +2513,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2561,7 +2563,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2583,7 +2585,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2598,12 +2600,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2619,12 +2621,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2635,12 +2637,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2660,7 +2662,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,7 +2688,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2708,7 +2710,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2734,7 +2736,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2794,7 +2796,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2810,7 +2812,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2862,45 +2864,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2910,7 +2912,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2992,17 +2994,12 @@ Double click on it to add his name on text writer.</source>
         <translation>brez</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3022,7 +3019,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3090,7 +3087,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3106,12 +3103,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
@@ -3121,17 +3118,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,7 +3138,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,22 +3163,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3201,27 +3188,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3267,17 +3259,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3297,12 +3289,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3310,7 +3302,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3350,7 +3342,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3375,7 +3367,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3385,7 +3377,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3424,7 +3416,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3434,7 +3426,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3459,7 +3451,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3472,7 +3464,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3507,7 +3499,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3517,7 +3509,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3582,7 +3579,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3610,7 +3607,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3620,20 +3617,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3643,14 +3637,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3660,8 +3652,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3686,7 +3677,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3978,7 +3969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3986,8 +3977,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3997,7 +3987,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4033,12 +4023,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4058,7 +4048,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4078,18 +4068,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4104,7 +4094,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Ime:</translation>
     </message>
@@ -4144,19 +4134,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4166,24 +4156,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
@@ -4193,7 +4171,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4246,13 +4224,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,7 +4249,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4306,7 +4284,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4316,7 +4294,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4461,17 +4439,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4496,12 +4474,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4516,12 +4489,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +4534,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,16 +4544,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+44"/>
+        <location line="+75"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4589,7 +4559,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+21"/>
+        <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 Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+93"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4604,7 +4583,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4634,17 +4613,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4697,7 +4676,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4707,8 +4686,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4731,7 +4710,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4766,7 +4745,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4776,7 +4755,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4791,7 +4770,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4812,7 +4791,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4820,17 +4799,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,12 +4819,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4844,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4875,7 +4859,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,12 +4869,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4889,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4970,33 +4959,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5086,7 +5075,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5754,7 +5743,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5762,38 +5751,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5801,12 +5790,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5968,7 +5957,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5978,7 +5967,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6038,21 +6027,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6174,7 +6153,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6216,7 +6195,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6252,7 +6231,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6268,7 +6247,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6505,7 +6484,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6543,7 +6522,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6554,132 +6533,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Ime</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Stanje</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6762,38 +6625,33 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6811,17 +6669,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6831,12 +6679,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6857,38 +6710,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6908,12 +6761,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6923,43 +6776,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7003,13 +6851,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7019,7 +6867,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7054,7 +6902,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7064,7 +6912,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7074,7 +6927,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7300,13 +7158,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7316,57 +7188,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7374,45 +7228,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7437,7 +7295,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7487,12 +7345,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7616,7 +7474,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7624,7 +7482,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7794,7 +7652,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7807,12 +7665,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7837,7 +7695,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7852,14 +7710,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
@@ -7870,13 +7728,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7889,7 +7747,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8025,7 +7883,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8036,22 +7894,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8071,12 +7929,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8111,22 +7969,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8146,17 +8004,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8166,10 +8024,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Stanje</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8207,18 +8072,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8233,7 +8088,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8248,7 +8103,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8262,11 +8117,6 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8276,7 +8126,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8297,7 +8147,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8359,18 +8209,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8385,17 +8235,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8423,13 +8273,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8499,7 +8349,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8535,7 +8385,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8550,13 +8400,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8571,7 +8421,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8586,7 +8436,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8646,22 +8496,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8736,13 +8576,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8793,17 +8632,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8918,7 +8757,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8931,7 +8770,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8961,7 +8800,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -9000,7 +8839,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9024,21 +8863,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9048,7 +8872,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9077,7 +8901,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9108,7 +8932,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9159,7 +8983,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9175,7 +8999,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9194,11 +9018,6 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9228,13 +9047,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9245,7 +9064,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9265,17 +9084,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9288,66 +9107,59 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9357,7 +9169,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9397,23 +9214,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9456,12 +9273,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+189"/>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9491,8 +9308,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9506,6 +9323,10 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">brez</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9575,12 +9396,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9641,7 +9462,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9661,7 +9482,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9713,7 +9534,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9723,7 +9544,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9738,7 +9559,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9804,12 +9625,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9844,12 +9665,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9860,12 +9681,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9873,7 +9694,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9933,7 +9754,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9956,7 +9777,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,12 +9793,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,23 +9815,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10026,28 +9847,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10057,12 +9872,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10072,7 +9887,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,12 +9962,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10168,22 +9978,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10191,7 +10006,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10251,7 +10066,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10308,12 +10123,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10336,7 +10151,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10349,14 +10164,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10366,7 +10181,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10376,12 +10191,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,14 +10211,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10420,7 +10222,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10468,7 +10270,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10855,7 +10657,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10871,7 +10673,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10890,7 +10692,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10964,7 +10766,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10974,7 +10776,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +10804,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11012,7 +10814,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11022,7 +10824,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11042,37 +10844,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11084,12 +10862,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11104,7 +10882,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11369,14 +11152,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11386,12 +11169,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11401,7 +11184,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11416,27 +11199,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11452,39 +11235,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11504,20 +11277,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11527,78 +11298,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Vrsta:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11609,17 +11380,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11634,24 +11405,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11666,12 +11437,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11681,7 +11447,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11756,7 +11522,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11786,7 +11552,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">neznano</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11801,7 +11567,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11849,7 +11615,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11857,7 +11623,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11900,7 +11666,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11980,7 +11746,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11996,12 +11762,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12106,7 +11877,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12156,21 +11927,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12180,7 +11951,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12195,7 +11966,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12210,12 +11981,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12235,12 +12006,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12250,7 +12021,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12258,7 +12029,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12288,13 +12059,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12308,7 +12073,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12318,12 +12083,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12334,27 +12094,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12374,7 +12134,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12384,18 +12144,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12405,7 +12159,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12415,7 +12174,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,15 +12184,10 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12459,7 +12213,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Dodaj</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,13 +12223,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12485,7 +12239,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12559,7 +12313,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
@@ -12569,12 +12323,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12597,34 +12351,18 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12642,32 +12380,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12688,12 +12421,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12702,31 +12430,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12736,7 +12459,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12764,7 +12487,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12780,8 +12503,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
@@ -12802,7 +12524,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12813,12 +12535,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12843,12 +12565,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Stanje</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12859,35 +12580,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Pomoč</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12902,12 +12619,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12937,7 +12649,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12957,7 +12669,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pokaži </translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13002,13 +12714,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13023,7 +12734,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13032,17 +12743,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13078,12 +12789,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13098,32 +12809,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13134,32 +12845,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13229,7 +12940,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13269,7 +12980,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13289,18 +13000,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13311,17 +13022,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13341,7 +13042,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13351,21 +13052,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13380,7 +13081,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13390,30 +13091,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13528,13 +13229,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13554,7 +13255,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13575,7 +13276,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13605,18 +13306,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13656,13 +13357,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13672,12 +13373,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13755,7 +13456,7 @@ Do you want to save message ?</source>
         <translation>Privzeto</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13765,7 +13466,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13788,7 +13489,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13796,7 +13497,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13824,7 +13525,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13834,37 +13535,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Od:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Do:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13904,7 +13605,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13956,7 +13657,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13966,12 +13667,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13981,22 +13682,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14005,24 +13701,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14037,12 +13723,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14064,6 +13750,10 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Izbriši</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14142,7 +13832,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14152,16 +13842,20 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Delete</source>
+        <translation type="vanished">Izbriši</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14191,17 +13885,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14232,7 +13926,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14242,7 +13936,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14252,7 +13946,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14261,16 +13955,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14297,12 +13981,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14378,7 +14062,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14392,7 +14076,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14407,28 +14091,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14463,17 +14137,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14527,7 +14191,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14537,7 +14201,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14572,7 +14236,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14713,7 +14377,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14723,7 +14387,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14737,13 +14401,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14776,13 +14434,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14792,12 +14455,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14830,7 +14493,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14851,7 +14514,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14881,19 +14544,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14903,12 +14566,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14918,7 +14581,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15033,7 +14696,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15043,7 +14706,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15150,7 +14813,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15165,7 +14828,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15175,12 +14838,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15418,7 +15081,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15438,12 +15101,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15458,7 +15121,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15469,19 +15132,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15489,7 +15150,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15628,12 +15289,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15678,7 +15334,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Možnosti</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15724,21 +15385,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15756,7 +15417,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15832,12 +15493,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15863,7 +15524,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15884,7 +15545,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
@@ -15924,7 +15585,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15982,7 +15643,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16300,17 +15961,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16339,7 +16000,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16398,19 +16059,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16446,12 +16107,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16662,27 +16323,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16735,7 +16381,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16755,8 +16401,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16781,13 +16427,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16815,12 +16461,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16835,22 +16481,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16866,17 +16502,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16886,7 +16512,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16906,22 +16532,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16936,7 +16552,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16947,7 +16563,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16957,7 +16573,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16965,12 +16581,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17004,7 +16620,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17042,17 +16658,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17068,7 +16674,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17083,17 +16689,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17106,18 +16707,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17128,12 +16729,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17143,7 +16744,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17153,17 +16754,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17173,7 +16774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17183,7 +16784,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -17224,7 +16825,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17247,17 +16848,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17267,15 +16858,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">neznano</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17285,42 +16876,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17340,7 +16931,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17370,17 +16961,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17395,17 +16986,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17415,31 +17001,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17454,7 +17036,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17528,16 +17110,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17627,16 +17199,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17744,7 +17316,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17760,7 +17332,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17795,12 +17367,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17844,27 +17416,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17874,12 +17446,12 @@ and use the import button to load it</source>
         <translation type="unfinished">Od:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17909,13 +17481,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17927,22 +17499,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17957,7 +17519,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17972,24 +17534,26 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished"></translation>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18000,7 +17564,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18019,7 +17583,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18029,7 +17593,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18056,7 +17620,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18066,7 +17630,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18086,7 +17650,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18202,7 +17766,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18210,42 +17774,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18277,7 +17836,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18285,8 +17844,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18554,12 +18113,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18590,7 +18149,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18624,7 +18183,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18643,26 +18202,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18742,7 +18281,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18752,7 +18291,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18762,7 +18301,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18778,7 +18317,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18845,7 +18384,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18873,7 +18412,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19053,29 +18592,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Ime</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Stanje</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19318,18 +18841,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19469,7 +18980,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19636,7 +19147,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19649,7 +19160,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19822,22 +19333,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19845,12 +19346,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20538,7 +20039,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Ime</translation>
@@ -20659,7 +20160,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Ime</translation>
     </message>
@@ -20679,7 +20180,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20735,7 +20236,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20749,6 +20250,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20762,11 +20268,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20789,17 +20290,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20823,9 +20319,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20846,7 +20340,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20907,7 +20401,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20928,7 +20422,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20958,7 +20452,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20976,7 +20470,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20993,12 +20487,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21059,7 +20553,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21074,7 +20568,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21174,23 +20668,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,7 +20694,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21237,7 +20731,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -21248,17 +20742,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21278,7 +20772,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21286,7 +20780,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21302,22 +20796,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21334,7 +20828,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21359,8 +20853,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21368,7 +20862,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21399,7 +20893,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21444,12 +20938,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21469,12 +20963,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21484,17 +20983,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21504,7 +20993,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21514,12 +21003,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21578,12 +21067,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21604,22 +21093,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21632,16 +21121,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21651,46 +21145,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21700,7 +21171,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21725,95 +21196,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21828,7 +21241,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished">neznano</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21838,7 +21315,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21850,12 +21342,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21865,7 +21357,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21880,23 +21372,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21907,7 +21399,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21917,7 +21419,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21927,7 +21434,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21967,7 +21484,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21982,7 +21499,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22018,32 +21540,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22098,7 +21595,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22123,7 +21620,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22135,7 +21632,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22158,7 +21655,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Stanje</translation>
     </message>
@@ -22218,28 +21715,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22255,18 +21741,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22301,12 +21787,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22329,22 +21815,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22379,7 +21865,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22389,12 +21875,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22474,7 +21960,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22484,12 +21970,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22508,7 +21994,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22528,17 +22014,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">Prekliči</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22548,7 +22034,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22639,7 +22125,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22647,7 +22133,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22698,16 +22184,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22717,7 +22198,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22732,7 +22213,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22748,7 +22229,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22773,7 +22254,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22916,12 +22397,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22945,7 +22426,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23284,7 +22765,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23521,7 +23002,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23557,15 +23038,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23575,13 +23053,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23591,57 +23074,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23649,7 +23087,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23659,7 +23097,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23670,12 +23108,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23703,7 +23140,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23714,7 +23151,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23724,27 +23161,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23829,7 +23261,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23838,12 +23270,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23868,12 +23295,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23938,7 +23360,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23948,17 +23375,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23986,7 +23403,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24014,19 +23431,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Ime</translation>
@@ -24233,12 +23650,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24263,7 +23675,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24284,7 +23696,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24317,17 +23729,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24342,7 +23744,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24469,18 +23871,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Pot</translation>
     </message>
@@ -24490,7 +23897,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24500,7 +23907,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24515,7 +23922,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24525,7 +23932,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24939,17 +24346,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24989,27 +24391,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25019,12 +24411,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25161,7 +24553,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25176,7 +24568,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25264,7 +24656,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25299,7 +24691,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25329,18 +24721,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Stanje</translation>
     </message>
@@ -25361,7 +24749,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25444,7 +24832,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25459,7 +24856,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25479,7 +24876,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25509,7 +24906,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25519,7 +24916,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25582,42 +24979,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25662,41 +25052,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25774,7 +25134,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25811,7 +25171,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_sr.ts b/retroshare-gui/src/lang/retroshare_sr.ts
index 01e51db3d..6d5a3f97d 100644
--- a/retroshare-gui/src/lang/retroshare_sr.ts
+++ b/retroshare-gui/src/lang/retroshare_sr.ts
@@ -122,12 +122,12 @@
         <translation>Напредна претрага</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Критеријум претраге</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Додајте додатни критеријум претраге.</translation>
     </message>
@@ -137,7 +137,7 @@
         <translation>Поништите критеријум претраге.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Отказује претрагу.</translation>
     </message>
@@ -157,6 +157,13 @@
         <translation>Претражи</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Јавно</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -541,7 +548,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -567,23 +574,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p kB</translation>
     </message>
@@ -626,7 +620,7 @@ p, li { white-space: pre-wrap; }
         <translation>Уклони</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -713,10 +707,22 @@ p, li { white-space: pre-wrap; }
         <translation>Поништи</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Брзина пријема</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Брзина слања</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Увек на врху</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Стил</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -732,11 +738,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% непровидно</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Сачувај</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Откажи</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Од:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Сакриј подешавања</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -809,7 +827,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Коментар</translation>
     </message>
@@ -839,12 +857,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -852,7 +870,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -872,7 +890,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -910,7 +928,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -930,7 +948,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -960,7 +978,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Промени статус порука</translation>
     </message>
@@ -970,7 +988,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -978,12 +996,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1003,18 +1021,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Прошири</translation>
     </message>
@@ -1029,12 +1047,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Уклони ставку</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1203,17 +1221,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1223,17 +1241,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1241,7 +1249,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1264,7 +1272,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1289,18 +1297,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Прошири</translation>
     </message>
@@ -1315,7 +1323,7 @@ into the image, so as to
         <translation type="unfinished">Уклони ставку</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
@@ -1325,7 +1333,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Коментар</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Сакриј</translation>
     </message>
@@ -1333,7 +1351,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
@@ -1524,7 +1542,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1557,14 +1575,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1572,13 +1589,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1588,7 +1605,29 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1598,7 +1637,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1655,12 +1694,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1670,42 +1709,23 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-564"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Приватно</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Јавно</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1715,25 +1735,38 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Не</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1745,47 +1778,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1800,7 +1833,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">Прикажи</translation>
@@ -1820,7 +1853,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Уклони ставку</translation>
     </message>
@@ -1865,7 +1898,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1880,7 +1913,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1900,7 +1933,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1925,7 +1958,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1955,7 +1988,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1965,10 +1998,14 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Стил</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1989,7 +2026,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2059,22 +2096,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">Претражи</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2084,17 +2111,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2191,7 +2208,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Разликује велика и мала слова</translation>
     </message>
@@ -2297,7 +2314,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2333,7 +2350,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
@@ -2368,12 +2385,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2453,6 +2470,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2490,7 +2512,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2512,7 +2534,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2562,7 +2584,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2584,7 +2606,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2599,12 +2621,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2620,12 +2642,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2636,12 +2658,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2661,7 +2683,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2687,7 +2709,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2709,7 +2731,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2735,7 +2757,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2795,7 +2817,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2811,7 +2833,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2863,45 +2885,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2911,7 +2933,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2993,17 +3015,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3023,7 +3040,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3091,7 +3108,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3107,12 +3124,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Назив:</translation>
     </message>
@@ -3122,17 +3139,17 @@ Double click on it to add his name on text writer.</source>
         <translation>Место:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Опције</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3142,7 +3159,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3167,22 +3184,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3202,27 +3209,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3268,17 +3280,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3298,12 +3310,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3311,7 +3323,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3351,7 +3363,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3376,7 +3388,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3386,7 +3398,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3425,7 +3437,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3435,7 +3447,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3460,7 +3472,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3473,7 +3485,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3508,7 +3520,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3518,7 +3530,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3583,7 +3600,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3611,7 +3628,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3621,20 +3638,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3644,14 +3658,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3661,8 +3673,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3687,7 +3698,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3979,7 +3990,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3987,8 +3998,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3998,7 +4008,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4034,12 +4044,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4059,7 +4069,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>ИД</translation>
     </message>
@@ -4079,18 +4089,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4105,7 +4115,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ИД</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Назив:</translation>
     </message>
@@ -4145,19 +4159,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4167,24 +4181,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
@@ -4194,7 +4196,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Претражи</translation>
@@ -4247,13 +4249,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4272,7 +4274,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4307,7 +4309,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4317,7 +4319,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4462,17 +4464,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4497,12 +4499,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4517,12 +4514,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4556,7 +4559,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,6 +4568,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Наслов</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4585,8 +4592,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4605,7 +4612,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4635,17 +4642,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4698,7 +4705,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4708,8 +4715,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4732,7 +4739,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4767,7 +4774,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4777,7 +4784,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4792,7 +4799,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4813,7 +4820,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4821,17 +4828,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Назив:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
@@ -4841,12 +4848,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4866,7 +4873,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4876,7 +4888,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4886,12 +4898,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4901,7 +4918,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4971,33 +4988,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5087,7 +5104,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5755,7 +5772,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5763,38 +5780,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5802,12 +5819,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5969,7 +5986,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5979,7 +5996,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6039,21 +6056,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6175,7 +6182,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ИД</translation>
     </message>
@@ -6217,7 +6224,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6253,7 +6260,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished">Претражи</translation>
@@ -6269,7 +6276,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6506,7 +6513,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6544,7 +6551,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6555,132 +6562,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Назив</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6763,38 +6654,33 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6812,17 +6698,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6832,12 +6708,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6858,38 +6739,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6909,12 +6790,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6924,43 +6805,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7004,13 +6880,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7020,7 +6896,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7055,7 +6931,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7065,7 +6941,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7075,7 +6956,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7301,13 +7187,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7317,57 +7217,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7375,45 +7257,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7438,7 +7324,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7488,12 +7374,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7617,7 +7503,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7625,7 +7511,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7795,7 +7681,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7808,12 +7694,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7838,7 +7724,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7853,14 +7739,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Последња порука</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
@@ -7871,13 +7757,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Популарност</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7890,7 +7776,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8026,7 +7912,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8037,22 +7923,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8072,12 +7958,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8112,22 +7998,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8147,17 +8033,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8167,10 +8053,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Образац</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8208,18 +8101,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8234,7 +8117,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -8249,7 +8132,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8263,11 +8146,6 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8277,7 +8155,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8298,7 +8176,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8360,18 +8238,18 @@ p, li { white-space: pre-wrap; }
         <translation>Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Коментар</translation>
     </message>
@@ -8386,17 +8264,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8424,13 +8302,13 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8500,7 +8378,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8536,7 +8414,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8551,13 +8429,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8572,7 +8450,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8587,7 +8465,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8647,22 +8525,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8737,13 +8605,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8794,17 +8661,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8919,7 +8786,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8932,7 +8799,7 @@ p, li { white-space: pre-wrap; }
         <translation>Образац</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8962,7 +8829,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Коментар</translation>
@@ -9001,7 +8868,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9025,21 +8892,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9049,7 +8901,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9078,7 +8930,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9109,7 +8961,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9160,7 +9012,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9176,7 +9028,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -9195,11 +9047,6 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9229,13 +9076,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9246,7 +9093,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -9266,17 +9113,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Сакриј</translation>
     </message>
@@ -9289,66 +9136,63 @@ before you can comment</source>
         <translation>Образац</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">…</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Последња порука</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9358,7 +9202,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9398,23 +9247,23 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9457,12 +9306,16 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Сакриј</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Прошири</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9492,8 +9345,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9576,12 +9429,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9642,7 +9495,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9662,7 +9515,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9714,7 +9567,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9724,7 +9577,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9739,7 +9592,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9805,12 +9658,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation type="unfinished"></translation>
@@ -9845,12 +9698,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Назив</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9861,12 +9714,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9874,7 +9727,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Јавно</translation>
     </message>
@@ -9934,7 +9787,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9957,7 +9810,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9973,12 +9826,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9995,23 +9848,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10027,28 +9880,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10058,12 +9905,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ИД</translation>
     </message>
@@ -10073,7 +9920,7 @@ This message is missing. You should receive it later.</source>
         <translation>Последња порука</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10148,12 +9995,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Популарност</translation>
     </message>
@@ -10169,22 +10011,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10192,7 +10039,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10252,7 +10099,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10309,12 +10156,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10337,7 +10184,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10350,14 +10197,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10367,7 +10214,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10377,12 +10224,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10402,14 +10244,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10421,7 +10255,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10469,7 +10303,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10856,7 +10690,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10872,7 +10706,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10891,7 +10725,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10965,7 +10799,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Образац</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10975,7 +10809,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11003,7 +10837,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11013,7 +10847,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11023,7 +10857,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11043,37 +10877,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11085,12 +10895,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11105,7 +10915,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11370,14 +11185,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11387,12 +11202,12 @@ p, li { white-space: pre-wrap; }
         <translation>Претражи</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11402,7 +11217,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11417,27 +11232,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished">Затвори</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11453,39 +11268,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11505,20 +11310,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11528,78 +11331,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11610,17 +11413,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11635,24 +11438,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11667,12 +11470,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11682,7 +11480,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11757,7 +11555,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11787,7 +11585,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11802,7 +11600,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11850,7 +11648,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11858,7 +11656,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11901,7 +11699,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11981,7 +11779,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11997,12 +11795,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12107,7 +11910,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12157,21 +11960,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12181,7 +11984,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12196,7 +11999,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12211,12 +12014,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12236,12 +12039,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12251,7 +12054,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12259,7 +12062,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12289,13 +12092,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12309,7 +12106,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12319,12 +12116,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12335,27 +12127,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12375,7 +12167,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12385,18 +12177,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12406,7 +12192,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12416,7 +12207,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12426,15 +12217,10 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Уклони</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12460,7 +12246,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Додај</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12470,13 +12256,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12486,7 +12272,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12560,7 +12346,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Умножи</translation>
     </message>
@@ -12570,12 +12356,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Уклони</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12598,34 +12384,18 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12643,32 +12413,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Статус:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12689,12 +12454,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12703,31 +12463,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12737,7 +12492,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12765,7 +12520,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12781,8 +12536,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Опције</translation>
     </message>
@@ -12803,7 +12557,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12814,12 +12568,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12844,12 +12598,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12860,35 +12613,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Помоћ</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12903,12 +12652,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12938,7 +12682,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12958,7 +12702,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Прикажи</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13003,13 +12747,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13024,7 +12767,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13033,17 +12776,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13079,12 +12822,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13099,32 +12842,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13135,32 +12878,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13230,7 +12973,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13270,7 +13013,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13290,18 +13033,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13312,17 +13055,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13342,7 +13075,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13352,21 +13085,21 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13381,7 +13114,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13391,30 +13124,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13529,13 +13262,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13555,7 +13288,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13576,7 +13309,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13606,18 +13339,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13657,13 +13390,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13673,12 +13406,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13756,7 +13489,7 @@ Do you want to save message ?</source>
         <translation>Подразумевано</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13766,7 +13499,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13789,7 +13522,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13797,7 +13530,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13825,7 +13558,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13835,37 +13568,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13905,7 +13638,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13957,7 +13690,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13967,12 +13700,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13982,22 +13715,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14006,24 +13734,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14038,12 +13756,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14065,6 +13783,10 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Обриши</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14143,7 +13865,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14153,16 +13875,20 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Delete</source>
+        <translation type="vanished">Обриши</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14192,17 +13918,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14233,7 +13959,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Наслов</translation>
     </message>
@@ -14243,7 +13969,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14253,7 +13979,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14262,16 +13988,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14298,12 +14014,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14379,7 +14095,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14393,7 +14109,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14408,28 +14124,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14464,17 +14170,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14528,7 +14224,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -14538,7 +14234,7 @@ Do you want to save message ?</source>
         <translation>Уклони ставку</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14573,7 +14269,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Сакриј</translation>
     </message>
@@ -14714,7 +14410,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14724,7 +14420,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14738,13 +14434,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14777,13 +14467,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14793,12 +14488,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14831,7 +14526,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14852,7 +14547,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14882,19 +14577,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">Претражи</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ИД</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14904,12 +14599,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14919,7 +14614,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15034,7 +14729,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15044,7 +14739,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15151,7 +14846,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15166,7 +14861,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15176,12 +14871,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15419,7 +15114,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15439,12 +15134,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15459,7 +15154,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15470,19 +15165,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15490,7 +15183,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15629,12 +15322,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15679,7 +15367,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Опције</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15725,21 +15418,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15757,7 +15450,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15833,12 +15526,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15864,7 +15557,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15885,7 +15578,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Уклони ставку</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Назив:</translation>
     </message>
@@ -15925,7 +15618,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15983,7 +15676,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16150,6 +15843,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Образац</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16162,6 +15862,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Коментар</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16301,17 +16005,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16340,7 +16044,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16399,19 +16103,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16447,12 +16151,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16663,27 +16367,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16736,7 +16425,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16756,8 +16445,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16782,13 +16471,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Коментар</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16816,12 +16505,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>Ретрошер</translation>
     </message>
@@ -16836,22 +16525,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16867,17 +16546,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16887,7 +16556,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16907,22 +16576,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16937,7 +16596,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16948,7 +16607,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16958,7 +16617,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16966,12 +16625,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17005,7 +16664,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17043,17 +16702,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17069,7 +16718,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -17084,17 +16733,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17107,18 +16751,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17129,12 +16773,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Коментар</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17144,7 +16788,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17154,17 +16798,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17174,7 +16818,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17184,7 +16828,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
@@ -17225,11 +16869,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Образац</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">Ретрошер</translation>
+    </message>
+</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17248,17 +16903,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17268,15 +16913,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17286,42 +16931,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17341,7 +16986,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Претражи</translation>
     </message>
@@ -17371,17 +17016,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17396,17 +17041,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17416,31 +17056,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17455,7 +17091,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Пријави ме</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17529,16 +17165,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17628,16 +17254,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17745,7 +17371,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17761,7 +17387,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17796,12 +17422,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17845,27 +17471,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17875,12 +17501,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17910,13 +17536,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17928,22 +17554,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17958,7 +17574,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17973,24 +17589,26 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished"></translation>
+        <source>...</source>
+        <translation type="vanished">…</translation>
     </message>
 </context>
 <context>
@@ -18001,7 +17619,7 @@ and use the import button to load it</source>
         <translation type="unfinished">Образац</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18020,7 +17638,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18030,7 +17648,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18057,7 +17675,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18067,7 +17685,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18087,7 +17705,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18203,7 +17821,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18211,42 +17829,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18278,7 +17891,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18286,8 +17899,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18555,12 +18168,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18591,7 +18204,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18625,7 +18238,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18644,26 +18257,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18743,7 +18336,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18753,7 +18346,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18763,7 +18356,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18779,7 +18372,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18846,7 +18439,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18874,7 +18467,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19054,29 +18647,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Назив</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19319,18 +18896,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19470,7 +19035,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19637,7 +19202,7 @@ p, li { white-space: pre-wrap; }
         <translation>Образац</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19650,7 +19215,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19823,22 +19388,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19846,12 +19401,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20539,7 +20094,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Назив</translation>
@@ -20660,7 +20215,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Назив</translation>
     </message>
@@ -20680,7 +20235,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20736,7 +20291,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20750,6 +20305,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20763,11 +20323,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20790,17 +20345,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20824,9 +20374,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20847,7 +20395,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20908,7 +20456,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20929,7 +20477,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20959,7 +20507,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20977,7 +20525,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20994,12 +20542,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21060,7 +20608,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21075,7 +20623,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21175,23 +20723,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21201,7 +20749,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21238,7 +20786,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation type="unfinished"></translation>
@@ -21249,17 +20797,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21279,7 +20827,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21287,7 +20835,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21303,22 +20851,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Уклони ставку</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21335,7 +20883,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Сакриј</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21360,8 +20908,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21369,7 +20917,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21400,7 +20948,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Прошири</translation>
     </message>
@@ -21445,12 +20993,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Статус:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21470,12 +21018,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21485,17 +21038,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Сакриј</translation>
     </message>
@@ -21505,7 +21048,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21515,12 +21058,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21579,12 +21122,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21605,22 +21148,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21633,16 +21176,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21652,46 +21200,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21701,7 +21226,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21726,95 +21251,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21829,7 +21296,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21839,7 +21370,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21851,12 +21397,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21866,7 +21412,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21881,23 +21427,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21908,7 +21454,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21918,7 +21474,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21928,7 +21489,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21968,7 +21539,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21983,7 +21554,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22019,32 +21595,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22099,7 +21650,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22124,7 +21675,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22136,7 +21687,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22159,7 +21710,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22219,28 +21770,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22256,18 +21796,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22302,12 +21842,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22330,22 +21870,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22380,7 +21920,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22390,12 +21930,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22475,7 +22015,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22485,12 +22025,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22509,7 +22049,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22529,17 +22069,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22549,7 +22089,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>Уклони</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22640,7 +22180,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22648,7 +22188,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22699,16 +22239,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22718,7 +22253,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22733,7 +22268,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22749,7 +22284,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22774,7 +22309,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22917,12 +22452,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22946,7 +22481,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23285,7 +22820,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23522,7 +23057,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23558,15 +23093,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23576,13 +23108,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23592,57 +23129,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23650,7 +23142,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23660,7 +23152,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23671,12 +23163,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23704,7 +23195,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23715,7 +23206,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23725,27 +23216,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23830,7 +23316,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23839,12 +23325,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23869,12 +23350,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23939,7 +23415,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23949,17 +23430,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23987,7 +23458,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24015,19 +23486,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Назив</translation>
@@ -24234,12 +23705,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24264,7 +23730,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24285,7 +23751,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ретрошер</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24318,17 +23784,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24343,7 +23799,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24470,18 +23926,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Путања</translation>
     </message>
@@ -24491,7 +23952,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24501,7 +23962,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24516,7 +23977,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24526,7 +23987,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24940,17 +24401,12 @@ p, li { white-space: pre-wrap; }
         <translation>Образац</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Статус:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24990,27 +24446,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25020,12 +24466,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25162,7 +24608,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25177,7 +24623,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25265,7 +24711,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25300,7 +24746,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25330,18 +24776,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25362,7 +24804,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25445,7 +24887,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">…</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25460,7 +24911,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25480,7 +24931,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25510,7 +24961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25520,7 +24971,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">Ретрошер</translation>
@@ -25583,42 +25034,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Образац</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Уклони</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Место:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25663,41 +25107,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation type="unfinished"></translation>
@@ -25775,7 +25189,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25812,7 +25226,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_sv.ts b/retroshare-gui/src/lang/retroshare_sv.ts
index 754e79479..3bdd3ebc7 100644
--- a/retroshare-gui/src/lang/retroshare_sv.ts
+++ b/retroshare-gui/src/lang/retroshare_sv.ts
@@ -84,6 +84,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Lägg till kommentar</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -121,12 +128,12 @@
         <translation>RetroShare: Avancerad sökning</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Sökkriterium</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Lägg till ytterligare sökkriterium.</translation>
     </message>
@@ -136,7 +143,7 @@
         <translation>Återställ sökkriterium.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Avbryter sökningen.</translation>
     </message>
@@ -156,6 +163,177 @@
         <translation>Sök</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Skapa album</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Albumnamn:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Kategori:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Djur</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Familj</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Kontakter</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Blommor</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Semester</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Landskap</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Husdjur</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Porträtt</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Resor</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">Arbete</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Blandat</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Taget:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Plats:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotograf:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beskrivning:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Fildelningsalternativ</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">Policy:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Kvallitet:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Kommentarer:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Identitet:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Publik</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Begränsad</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Storleksändra bilder (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Storleksändra bilder (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Skicka originalbilder</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Inga kommentarer tillåtna</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Autentiserade kommentarer</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Alla kommentarer tillåtna</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Publicera med identitet</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Dra &amp;amp; släpp för att infoga bilder. Klicka på en bild för att redigera.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Tillbaka</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Lägg till bilder</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Publicera album</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Namnlöst album</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Säg något om detta album...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Var togs dessa bilder?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Läs in albumminiatyr</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -164,11 +342,19 @@
         <source>Album</source>
         <translation>Album</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Albumminiatyr</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Sammanfattning</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -184,6 +370,34 @@
         <source>Caption</source>
         <translation>Taget</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Plats:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Tidpunkt</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beskrivning:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Fildelningsalternativ</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Kommentarer</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Publicera identitet</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Synlighet</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -552,7 +766,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Varning! De här tjänsterna är experimentella. Hjälp oss gärna att testa dem.
@@ -568,6 +782,14 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <source>Circles</source>
         <translation>Cirklar</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">GxsForum</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">Gxs-kanaler</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -579,23 +801,10 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation>Bilder</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -632,13 +841,17 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Lägg till profilbild</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Lägg till din probild</translation>
     </message>
@@ -657,6 +870,10 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Läs in profilbild</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -725,10 +942,22 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation>Återställ</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Mottagningshastighet</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Sändningshastighet</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Alltid överst</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stil</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -744,11 +973,23 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <source>% Opaque</source>
         <translation>% Opak</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Spara</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">Avbryt</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Sedan:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Dölj inställningar</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -821,7 +1062,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentar</translation>
     </message>
@@ -851,12 +1092,12 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -864,7 +1105,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -884,7 +1125,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +1163,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -942,7 +1183,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -972,7 +1213,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Dela</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">Växla meddelandestatus</translation>
     </message>
@@ -982,7 +1223,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Nytt</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -990,12 +1231,12 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Jag gillar detta</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1015,18 +1256,18 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Profilbild</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1041,12 +1282,12 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished">Ta bort objektet</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1215,17 +1456,17 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Kanaler</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Flikar</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
@@ -1235,17 +1476,11 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">Nerladdningar</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">Ladda inlägg i bakgrunden (Tråd)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Öppna varje kanal i en ny flik</translation>
     </message>
@@ -1253,7 +1488,7 @@ Kom bara ihåg... all data här, *KOMMER* att förloras när vi uppgraderar prot
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1276,7 +1511,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Jag gillar detta</translation>
     </message>
@@ -1301,18 +1536,18 @@ into the image, so as to
         <translation type="unfinished">Profilbild</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1327,7 +1562,7 @@ into the image, so as to
         <translation type="unfinished">Ta bort objektet</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -1337,7 +1572,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Dölj</translation>
     </message>
@@ -1345,7 +1590,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -1536,7 +1781,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Visa chattlobby</translation>
     </message>
@@ -1548,6 +1793,22 @@ into the image, so as to
         <source>Chats</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">Du har %1 nya meddelanden</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">Du har %1 nytt meddelande</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 nya meddelanden</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 nytt meddelande</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1569,14 +1830,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Okänd lobby</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Ta bort alla</translation>
     </message>
@@ -1584,13 +1844,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Antal</translation>
     </message>
@@ -1600,7 +1860,29 @@ into the image, so as to
         <translation>Ämne</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1610,7 +1892,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1667,12 +1949,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1682,31 +1964,31 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Skapa ny chattlobby</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Ämne saknas]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Vald lobbyinformation</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Privat</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Publik</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1716,25 +1998,42 @@ Double click a chat room to enter and chat.</source>
         <translation>Avsluta Prenumeration</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Prenumerera</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Sök Chat Lobbyn</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Sök namn</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Prenumererat</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Kolumner</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Nej</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1746,47 +2045,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Ämne:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Säkerhet:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Användare:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
@@ -1801,24 +2100,13 @@ Double click a chat room to enter and chat.</source>
         <translation>Inga anonyma ID</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>kolumn</translation>
@@ -1832,7 +2120,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Ta bort objektet</translation>
     </message>
@@ -1877,7 +2165,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
@@ -1892,7 +2180,19 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Chat Settings</source>
+        <translation type="vanished">Chattinställningar</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Aktivera uttryckssymboler i privat chatt</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Aktivera uttryckssymboler i gruppchatt</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Aktivera anpassat teckensnitt</translation>
     </message>
@@ -1912,7 +2212,7 @@ Double click a chat room to enter and chat.</source>
         <translation>Aktivera kursiv stil</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1937,7 +2237,11 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished">Ladda inbäddade bilder</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Chattlobby</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Blinka med flikikon</translation>
     </message>
@@ -1946,6 +2250,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Privatchatt</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1967,7 +2275,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Blinka med fönster-/flikikon</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Chatteckensnitt</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Ändra teckensnitt</translation>
     </message>
@@ -1977,10 +2289,14 @@ Double click a chat room to enter and chat.</source>
         <translation>Teckensnitt:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Historik</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Stil</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1995,13 +2311,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Gruppchatt</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Privatchatt</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2065,28 +2385,22 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Chatlobbyn</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Aktiverad:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">Sök</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2096,17 +2410,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2203,7 +2507,11 @@ Double click a chat room to enter and chat.</source>
         <translation>Maximalt antal dagar att spara (0 = behåll allt):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Sök som standard</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Skiftlägeskänslig</translation>
     </message>
@@ -2309,7 +2617,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Visa chatt</translation>
     </message>
@@ -2345,7 +2653,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
@@ -2380,12 +2688,12 @@ Double click a chat room to enter and chat.</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2465,6 +2773,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2502,7 +2815,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>skriver...</translation>
     </message>
@@ -2524,7 +2837,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Vill du verkligen ta bort historiken?</translation>
     </message>
@@ -2574,7 +2887,7 @@ after HTML conversion.</source>
         <translation>är upptagen och kanske inte svarar.</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2596,7 +2909,7 @@ after HTML conversion.</source>
         <translation>Sluta inte att färga efter X hittade (använder mer CPU)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2611,12 +2924,16 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Status)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Ange teckensnitt &amp; färg</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Bifoga en fil</translation>
     </message>
@@ -2632,12 +2949,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2648,12 +2965,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2673,7 +2990,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Skriv ett meddelande här</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2699,7 +3016,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Visningsdetaljer:</translation>
     </message>
@@ -2721,7 +3038,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Privata cirklar</translation>
     </message>
@@ -2747,7 +3064,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Kontakter</translation>
     </message>
@@ -2807,7 +3124,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Vänners vänner</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Externa Cirklar (Administratör)</translation>
     </message>
@@ -2823,7 +3140,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Cirklar</translation>
     </message>
@@ -2875,45 +3192,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Fel: Kan inte hämta användaruppgifter.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2923,7 +3240,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Kryptering</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation>Inte ansluten</translation>
     </message>
@@ -3005,17 +3322,12 @@ Double click on it to add his name on text writer.</source>
         <translation>ingen</translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3035,7 +3347,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>med</translation>
     </message>
@@ -3052,16 +3364,104 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>Anslut kontakt ((Steg för steg-guide))</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Lägg till en ny kontakt</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Du får en certifikatfil från en kontakt</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;Skapa kontakt med en utvald kontakt till en befintlig kontakt</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">Inkludera signaturer</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Kopiera certifikatet till Urklipp</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Spara certifikatet till fil</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">Starta e-postprogrammet</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Certifikatfiler</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Använd PGP-certifikat som sparats i filer.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Importera en kontakts certifikat...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Du behöver generera en certifikatfil och ge den till din kontakt. Du kan också använda en befintlig certifikatfil.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Exportera mitt certifikat...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Dra och släpp din kontakts certifikat i det här fönstret, eller ange sökväg i nedanstående textfält</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Bläddra</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Kontakter till kontakter</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Välj vem du vill skapa kontakt med</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Visa mig:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Skapa kontakt med dessa användare</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare-ID</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">Använd RetroShare-ID för att lägga till en kontakt som är tillgänglig i ditt nätverk.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Lägg till kontaktens RetroShare-ID...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Klistra in kontaktens RetroShare-ID i nedanstående indataruta</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Ange kontaktens RetroShare-ID. Ex. Användare@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3103,7 +3503,27 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished">E-post</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Bjud in kontakter via e-post</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Ange kontaktens e-postadresser (separera med semikolon)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Kontaktens e-postadresser:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Ange kontaktens e-postadresser</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Ämne: </translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3119,32 +3539,40 @@ Double click on it to add his name on text writer.</source>
         <translation>Fakta om begäran</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Användarinformation</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">E-post:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Nod:</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Alternativ</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Lägg till kontakt till grupp:</translation>
     </message>
@@ -3154,7 +3582,7 @@ Double click on it to add his name on text writer.</source>
         <translation>Autentisera kontakt (Signera PGP-nyckel)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3179,22 +3607,16 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Lägg till en kontakt att ansluta till</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Klicka på &apos;Slutför&apos; för att acceptera denna kontaktförfrågan</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Något fel uppstod</translation>
     </message>
@@ -3214,27 +3636,32 @@ Double click on it to add his name on text writer.</source>
         <translation>Fakta om din kontakt:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Nyckelvaliditet:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>Signerad av:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Denna användare finns redan på din kontaktlista. Att lägga till den kanske bara anger IP-adress.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3280,17 +3707,45 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Certifikatinläsning misslyckades</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">Kan inte hämta användarinformation för PGP-nyckel %1</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">Vilken användare som helst, som jag inte signerat</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Kontakter till mina kontakter som redan litar på mig</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Signerade användare som visas som avvisade</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Användarnamn</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Också signerad av</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Användar-ID</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare-inbjudan</translation>
     </message>
@@ -3310,12 +3765,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3323,7 +3778,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3363,7 +3818,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Du har en kontaktförfrågan från</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3388,7 +3843,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3398,7 +3853,47 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Certifikatinläsning misslyckades! %1 kan inte hittas</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">%1 finns inte tillgänglig i ditt nätverk</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Använd nytt certifikatformat (säkrare, mer robust)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Använd gammalt (bakåtkompatibelt) certifikatformat</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">Ta bort signaturer</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">RetroShare-inbjudan</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Anslut kontakt Hjälp</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Du kan kopiera denna text och skicka den till din kontakt via e-post eller på något annat sätt.</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Ditt certifikat är kopierat till Urklipp, klistra in och skicka det till din kontakt via e-post eller på något annat sätt.</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Spara som...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3437,7 +3932,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** Ingen ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Använd som direkt källa, om tillgänglig</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3447,7 +3946,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP-adress</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3466,13 +3965,41 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Rekommendera många användare åt varandra</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Kontaktrekommendationer</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">Meddelande:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Rekommendera kontakter</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Till</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Välj minst en kontakt för rekommendation.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Välj minst en kontakt som mottagare.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Lägg till nyckel till nyckelring</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Den här nyckeln finns redan i din nyckelring</translation>
     </message>
@@ -3485,7 +4012,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Certifikatet har fel versionsnummer. Kom ihåg att v0.6 och v0.5-nätverk inte är kompatibla med varandra.</translation>
     </message>
@@ -3520,7 +4047,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3530,7 +4057,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3595,7 +4127,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>UDP Inställning</translation>
     </message>
@@ -3623,7 +4155,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Anslutningsassistent</translation>
     </message>
@@ -3633,20 +4165,17 @@ p, li { white-space: pre-wrap; }
         <translation>Ogiltigt Användar-ID</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Okänt tillstånd</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Frånkopplad</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Bakom symmetrisk NAT</translation>
     </message>
@@ -3656,14 +4185,12 @@ p, li { white-space: pre-wrap; }
         <translation>Bakom NAT &amp; Ingen DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>NET Återstart</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>Bakom NAT</translation>
     </message>
@@ -3673,8 +4200,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ingen DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>NET TILLSTÅND BRA!</translation>
     </message>
@@ -3699,7 +4225,7 @@ p, li { white-space: pre-wrap; }
         <translation>Söker RS-användare</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Sökning kräver DHT</translation>
     </message>
@@ -3991,7 +4517,7 @@ p, li { white-space: pre-wrap; }
         <translation>Försök igen genom att importera en fullständig Nyckel</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3999,8 +4525,7 @@ p, li { white-space: pre-wrap; }
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>OVERIFIERBAR VIDAREBEFORDRING!</translation>
     </message>
@@ -4010,7 +4535,7 @@ p, li { white-space: pre-wrap; }
         <translation>OVERIFIERBAR VIDAREBEFORDRING &amp; INGEN DHT</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Söker</translation>
     </message>
@@ -4046,12 +4571,12 @@ p, li { white-space: pre-wrap; }
         <translation>Cirkeldetaljer</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4071,7 +4596,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4091,18 +4616,18 @@ p, li { white-space: pre-wrap; }
         <translation>Filter</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Användarnamn</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4117,7 +4642,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Typ</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">Namn:</translation>
     </message>
@@ -4157,19 +4690,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Ange ett namn för din cirkel</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Ingen begränsad cirkel vald</translation>
     </message>
@@ -4179,24 +4712,12 @@ p, li { white-space: pre-wrap; }
         <translation>Inga cirkel begränsningar valda</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Lägg till</translation>
     </message>
@@ -4206,7 +4727,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Sök</translation>
@@ -4221,6 +4742,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>Signerad</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Signerad av kända noder</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4237,6 +4762,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP-identitet</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">Anonymt Id</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4259,13 +4788,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished">Skapa</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP-länkat ID</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4284,7 +4817,7 @@ p, li { white-space: pre-wrap; }
         <translation>Skapa en ny grupp</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished">Gruppnamn:</translation>
     </message>
@@ -4319,7 +4852,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Nytt kanalinlägg</translation>
     </message>
@@ -4329,7 +4862,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanalinlägg</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4390,11 +4923,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Använd Dra och släpp / Lägg till fil, för att hash-beräkna nya filer.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Kopiera/Klistra in RetroShare-länkar från dina utdelade mappar&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Bifofoga fil</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Lägg till kanalminiatyr</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Meddelande</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Ämne:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4480,17 +5025,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4509,18 +5054,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Filen är redan tillagd och hash-beräknad</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Ange ett ämne</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Läs in miniatyrbild</translation>
     </message>
@@ -4535,12 +5079,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Generera massdata</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Vill du verkligen generera %1 meddelanden?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Du är på väg att lägga till filer som du inte delar. Vill du verkligen fortsätta?</translation>
     </message>
@@ -4574,7 +5124,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Posta foruminlägg</translation>
     </message>
@@ -4583,6 +5133,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Ämne</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4603,8 +5157,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4623,7 +5177,7 @@ p, li { white-space: pre-wrap; }
         <translation>Du kan bifoga filer via Dra &amp; släpp i det här fönstret</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4653,17 +5207,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Inga forum</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>Som svar på</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4716,7 +5270,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Läs in en bildfil</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4726,8 +5280,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Generera massdata</translation>
     </message>
@@ -4736,6 +5290,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Vill du verkligen generera %1 meddelanden?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Skicka</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4750,7 +5308,23 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Skapa ny chattlobby</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">En chattlobby är en decentraliserad och anonym chattgrupp. Samtliga deltagare tar emot alla meddelanden. När lobbyn är skapad kan du bjuda in andra kontakter via kontakt-fliken</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Lobbynamn:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Lobbyämne:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4785,7 +5359,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Skapa</translation>
     </message>
@@ -4795,7 +5369,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4810,7 +5384,11 @@ Do you want to discard this message?</source>
         <translation>Välj de kontakter du vill gruppchatta med.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Inbjudna kontakter</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4831,7 +5409,7 @@ Do you want to discard this message?</source>
         <translation>Kontakter:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Identitet att använda:</translation>
     </message>
@@ -4839,17 +5417,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Öppen information</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
@@ -4859,12 +5437,12 @@ Do you want to discard this message?</source>
         <translation>Plats-ID:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Programversion:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Uppkopplad sedan:</translation>
     </message>
@@ -4884,7 +5462,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4894,7 +5477,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Annan information</translation>
     </message>
@@ -4904,12 +5487,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Certifikat</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4919,7 +5507,11 @@ Do you want to discard this message?</source>
         <translation>Inkludera signaturer</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Spara nyckel som fil</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Exportera identitet</translation>
     </message>
@@ -4993,33 +5585,33 @@ och där läsa in den med importfunktionen.</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>PGP fingeravtryck:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Nodinformation</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP Id :</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Vännoder:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5058,6 +5650,14 @@ och där läsa in den med importfunktionen.</translation>
         <source>Node</source>
         <translation>Nod</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Skapa ny node...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">visa statistikfönster</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5109,7 +5709,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5777,7 +6377,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Starta</translation>
     </message>
@@ -5785,38 +6385,38 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>till</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>Ignorera skiftläge</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>dd.MM.yyyy</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5824,12 +6424,12 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>Uttrycks-widget</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Ta bort det här uttrycket</translation>
     </message>
@@ -5991,7 +6591,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Bild</translation>
     </message>
@@ -6001,7 +6601,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
@@ -6061,21 +6661,11 @@ och där läsa in den med importfunktionen.</translation>
         <source>C </source>
         <translation>C </translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Kontakters mappar</translation>
     </message>
@@ -6197,7 +6787,7 @@ och där läsa in den med importfunktionen.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6239,7 +6829,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Visa grupper</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Grupp</translation>
     </message>
@@ -6275,7 +6865,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Lägg till i grupp</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Sök</translation>
@@ -6291,7 +6881,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Sortera efter stadie</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6528,7 +7118,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Bekräfta kontaktförfrågan</translation>
     </message>
@@ -6545,6 +7135,10 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Sök:</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6566,7 +7160,7 @@ at least one peer was not added to a group</source>
         <translation>Sök kontakter</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Markera alla</translation>
     </message>
@@ -6577,132 +7171,16 @@ at least one peer was not added to a group</source>
         <translation>Markera ingen</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Namn</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Status</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Skapa kontakt</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Redigera statusmeddelande</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Sändning</translation>
     </message>
@@ -6785,38 +7263,33 @@ Also check your ports!</source>
         <translation>Återställ standardteckensnitt</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Nyckelring</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>Retroshare utsändningschat: meddelanden skickas till alla anslutna vänner.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Nätverksgraf</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Ange ditt statusmeddelande här.</translation>
     </message>
@@ -6834,17 +7307,7 @@ Also check your ports!</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Samtliga indatafält kräver minst 3 tecken</translation>
     </message>
@@ -6854,12 +7317,17 @@ Also check your ports!</source>
         <translation>Lösenorden stämmer inte överens</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Detta lösenord är för PGP</translation>
@@ -6880,38 +7348,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6931,12 +7399,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6946,43 +7414,42 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Avancerade alternativ</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>gömd adress</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7026,13 +7493,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Importera profil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7042,7 +7509,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7077,7 +7544,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7087,7 +7554,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7097,7 +7569,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7323,13 +7800,36 @@ and use the import button to load it</source>
         <translation>Kom igång</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Bjud in kontakter</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;RetroShare är ingentig utan dina kontakter. Klicka på knappen för att starta processen.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;&lt;/p&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-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Skicka en inbjudan med ditt certifikat, via e-post, till dina vänner.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;&lt;/p&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-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Tillse att du får en inbjudan i retur... &lt;/span&gt;&lt;/p&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-family:&apos;Arial&apos;; font-size:12pt;&quot;&gt;Du kan endast ansluta till kontakter om ni båda har lagt till varandra.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Lägg till dina kontakter i RetroShare</translation>
     </message>
@@ -7339,103 +7839,89 @@ and use the import button to load it</source>
         <translation>Lägg till kontakter</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Anslut till kontakter</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Avancerat: Öppna brandväggsport</translation>
-    </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Anslut till kontakter</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Avancerat: Öppna brandväggsport</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Mer hjälp och support</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>RetroShare Hemsida</translation>
     </message>
@@ -7460,7 +7946,7 @@ p, li { white-space: pre-wrap; }
         <translation>Återkoppling (e-post)</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare Inbjudan</translation>
     </message>
@@ -7510,12 +7996,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare återkoppling</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>RetroShare support</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7639,7 +8125,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Visa gruppchatt</translation>
     </message>
@@ -7647,7 +8133,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7817,7 +8303,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
@@ -7830,12 +8316,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7860,7 +8346,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort by Name</source>
+        <translation type="vanished">Sortera efter namn</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Sortera efter popularitet</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Sortera efter senaste inlägg</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7875,14 +8373,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished">Senaste inlägget</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
@@ -7893,13 +8391,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Popularitet</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Visa</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7912,7 +8414,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>och</translation>
     </message>
@@ -8048,7 +8550,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanaler</translation>
@@ -8059,22 +8561,22 @@ p, li { white-space: pre-wrap; }
         <translation>Skapa kanal</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Aktivera automatisk nedladdning</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Mina kanaler</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Kanalabonnemang</translation>
     </message>
@@ -8094,12 +8596,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Inaktivera automatisk nedladdning</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8134,22 +8636,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Spela upp</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
@@ -8169,17 +8671,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>Vill du verkligen avbryta och radera filen?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Kan inte öppna mapp</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Spela upp fil</translation>
     </message>
@@ -8189,10 +8691,33 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1 finns inte i den mappen.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulär</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Filname</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Storlek</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Rubrik</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Status</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Skapa ny kanal</translation>
     </message>
@@ -8230,19 +8755,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Abonnera på kanal</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8256,7 +8771,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Visa</translation>
     </message>
@@ -8271,7 +8786,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanalbeskrivning</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Läser in</translation>
     </message>
@@ -8286,9 +8801,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
+        <source>New Channel</source>
+        <translation type="vanished">Ny kanal</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8299,7 +8813,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8320,7 +8834,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Spela upp</translation>
     </message>
@@ -8376,24 +8890,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Filer</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Varning! Det är mindre än %1 timmar och %2 minuter kvar tills den här filen raderas. Överväg att spara den.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Nytt</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
@@ -8408,17 +8926,21 @@ p, li { white-space: pre-wrap; }
         <translation>Jag gillar inte detta</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Läser in</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8443,16 +8965,83 @@ p, li { white-space: pre-wrap; }
         <translation>Spela upp media</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Posta i kanal</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Läser in</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Sök kanaler</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Rubrik</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Sök titel</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">Meddelande</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">Sök meddelanden</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Filname</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Sök filnamn</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Inga kanaler markerade</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Inaktivera automatisk nedladdning</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Aktivera automatisk nedladdning</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Visa filer</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Flöden</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Filer</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Beskrivning:</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Posta i kanal</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8522,7 +9111,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8558,7 +9147,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentarer</translation>
     </message>
@@ -8573,13 +9162,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Flöden</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8594,7 +9183,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8609,7 +9198,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8669,22 +9258,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8759,13 +9338,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">Prenumererat</translation>
     </message>
@@ -8816,17 +9394,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8941,7 +9519,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Kommentarsbehållare</translation>
     </message>
@@ -8954,7 +9532,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulär</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8984,7 +9562,7 @@ p, li { white-space: pre-wrap; }
         <translation>Uppdatera</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
@@ -9023,7 +9601,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Besvara kommentar</translation>
     </message>
@@ -9047,21 +9625,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Rösta ned</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9071,7 +9634,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kommentera</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9100,10 +9663,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Kommentera&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">Signerad av</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9132,7 +9711,7 @@ before you can comment</source>
 innan du kan kommentera</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9174,6 +9753,14 @@ innan du kan kommentera</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Lägg till forumadministratörer</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Välj forumadministratörer</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9183,7 +9770,7 @@ innan du kan kommentera</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Prenumerera på forum</translation>
     </message>
@@ -9199,7 +9786,7 @@ innan du kan kommentera</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Visa</translation>
     </message>
@@ -9219,9 +9806,8 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">Läser in</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9252,13 +9838,13 @@ innan du kan kommentera</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Ämne:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Avsluta prenumeration på forum</translation>
     </message>
@@ -9269,7 +9855,7 @@ innan du kan kommentera</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Visa</translation>
     </message>
@@ -9289,17 +9875,21 @@ innan du kan kommentera</translation>
         <translation>Svar svar på:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Läser in</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
@@ -9312,66 +9902,63 @@ innan du kan kommentera</translation>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Starta ny tråd i aktuellt forum</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Sök i forum</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Senaste inlägget</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished">Ny tråd</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>Trådvy</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Platt vy</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Rubrik</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Författare</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Läser in</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9381,7 +9968,12 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>Svarsmeddelande</translation>
     </message>
@@ -9405,6 +9997,10 @@ innan du kan kommentera</translation>
         <source>Download all files</source>
         <translation>Ladda ner alla filer</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Nästa olästa</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9421,23 +10017,31 @@ innan du kan kommentera</translation>
         <translation>Sök författare</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">Innehåll</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">Sökinnehåll</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Inget namn</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Svara</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9480,12 +10084,16 @@ innan du kan kommentera</translation>
         <translation>Kopiera RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Expandera</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9515,8 +10123,8 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9530,6 +10138,22 @@ innan du kan kommentera</translation>
         <source>Anti-spam</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">Anonym</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">signerad</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">ingen</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... Meddelande saknas ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9599,12 +10223,12 @@ innan du kan kommentera</translation>
         <translation>Originalmeddelande</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">Redigera</translation>
     </message>
@@ -9665,7 +10289,7 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9685,7 +10309,7 @@ innan du kan kommentera</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9737,7 +10361,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9747,7 +10371,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9762,7 +10386,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9828,12 +10452,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forum</translation>
@@ -9864,16 +10488,35 @@ This message is missing. You should receive it later.</source>
         <translation>Andra forum</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Väntar</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Tar emot</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Läser in</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Lägg till ikon</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Nyckelmottagare kan publicera på begränsad Wiki-grupp, och kan visa och publicera på privata kanaler</translation>
     </message>
@@ -9882,14 +10525,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Dela publiceringsnyckel</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">Markera de användare du vill dela privat publiceringsnyckel med.</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Dela nyckel med</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>Meddelandedistribution</translation>
     </message>
@@ -9897,7 +10548,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Publik</translation>
     </message>
@@ -9916,6 +10567,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Ny tråd</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Obligatorisk</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Krypterade meddelanden</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9957,7 +10616,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished">Kommentarer:</translation>
     </message>
@@ -9980,7 +10639,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9996,12 +10655,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10018,23 +10677,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10050,28 +10709,26 @@ This message is missing. You should receive it later.</source>
         <translation>Lägg till ett namn</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Läs in grupplogotyp</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Kommer att användas för att skicka feedback</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Ägare:</translation>
     </message>
@@ -10081,12 +10738,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10096,7 +10753,7 @@ This message is missing. You should receive it later.</source>
         <translation>Senaste inlägget</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10171,12 +10828,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Popularitet</translation>
     </message>
@@ -10192,22 +10844,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Skapa</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Upphovsman</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10215,7 +10872,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Läser in</translation>
     </message>
@@ -10275,7 +10932,7 @@ This message is missing. You should receive it later.</source>
         <translation>Redigera detaljer</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10332,12 +10989,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopiera RetroShare-länk</translation>
     </message>
@@ -10360,7 +11017,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>Ingen signatur</translation>
     </message>
@@ -10373,14 +11030,22 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Läser in</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Hittades inte</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">Ingen signatur</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10390,7 +11055,7 @@ This message is missing. You should receive it later.</source>
         <translation>okänd nyckel</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10400,12 +11065,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10425,14 +11085,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10444,7 +11096,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10492,13 +11144,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Läser in</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10879,7 +11535,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10895,7 +11551,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Upphovsmän</translation>
     </message>
@@ -10914,7 +11570,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10992,7 +11648,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulär</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +11658,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11030,7 +11686,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11040,7 +11696,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished">Kopiera certifikatet till Urklipp</translation>
     </message>
@@ -11050,7 +11706,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished">Spara certifikatet till fil</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11070,37 +11726,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11112,12 +11744,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11132,7 +11764,12 @@ new short format</source>
         <translation type="unfinished">RetroShare-inbjudan</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished">Spara som...</translation>
     </message>
@@ -11397,14 +12034,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Alla</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Rykte</translation>
     </message>
@@ -11414,12 +12051,12 @@ p, li { white-space: pre-wrap; }
         <translation>Sök</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>Anonymt Id</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Skapa ny identitet</translation>
     </message>
@@ -11429,7 +12066,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11444,27 +12081,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished">Stäng</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11480,39 +12117,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished">Cirklar</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11532,20 +12159,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Privata cirklar</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Redigera identitet</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Ta bort identitet</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11555,78 +12180,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>Identitets-ID</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>Skicka meddelande</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Identitetsinfo</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Identitets-ID :</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Negativ</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>Neutral</translation>
     </message>
@@ -11637,17 +12262,17 @@ p, li { white-space: pre-wrap; }
         <translation>Positiv</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>Anonym</translation>
     </message>
@@ -11662,24 +12287,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11694,12 +12319,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11709,7 +12329,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11784,7 +12404,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11814,7 +12434,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">okänd</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11829,7 +12449,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished">Editera cirkeln</translation>
     </message>
@@ -11877,7 +12497,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11885,7 +12505,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11928,7 +12548,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12008,7 +12628,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12024,12 +12644,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12134,7 +12759,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12184,21 +12809,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Din avatar</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12208,7 +12833,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12223,7 +12848,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12238,12 +12863,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12263,12 +12888,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Ägd av</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Nodnamn:</translation>
     </message>
@@ -12278,7 +12903,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Nod-ID :</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12286,7 +12911,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Användarnamn</translation>
     </message>
@@ -12316,7 +12941,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Pseudonym</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12326,19 +12951,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Ny identitet</translation>
     </message>
@@ -12352,7 +12970,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12362,12 +12980,7 @@ These identities will soon be not supported anymore.</source>
         <translation>N/A</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Editera identitet</translation>
@@ -12378,27 +12991,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12418,7 +13031,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12428,7 +13041,11 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Ett fel uppstod vid hämtning av nyckeln!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Fel NyckelID felaktigt</translation>
     </message>
@@ -12443,7 +13060,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Okänt riktigt namn</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Skapa ny Identitet</translation>
     </message>
@@ -12453,15 +13070,10 @@ These identities will soon be not supported anymore.</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">Ta bort</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12487,7 +13099,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Lägg till</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Skapa</translation>
     </message>
@@ -12497,13 +13109,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Din avatar</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12513,7 +13125,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12572,6 +13184,10 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>PGP-namn:</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">GXS-id:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12587,7 +13203,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Kopiera</translation>
     </message>
@@ -12597,12 +13213,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Markera alla</translation>
     </message>
@@ -12621,38 +13237,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">Citera</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Skicka</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12670,32 +13274,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Port:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12716,12 +13315,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12730,31 +13324,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Kontrollerar...</translation>
     </message>
@@ -12764,7 +13353,7 @@ These identities will soon be not supported anymore.</source>
         <translation>Kontrollera filer</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12792,7 +13381,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Lägg till kontakt</translation>
     </message>
@@ -12808,8 +13397,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Alternativ</translation>
     </message>
@@ -12830,7 +13418,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Avsluta</translation>
     </message>
@@ -12841,12 +13429,12 @@ These identities will soon be not supported anymore.</source>
         <translation>Snabbstartsguide</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 en säker, decentraliserad kommunikationsplattform</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Pågående</translation>
     </message>
@@ -12875,12 +13463,11 @@ Frigör mer diskutrymme och klicka OK.</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Meddela</translation>
     </message>
@@ -12891,35 +13478,31 @@ Frigör mer diskutrymme och klicka OK.</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>Öppna meddelanden</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Bandbreddsgraf</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Program</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Hjälp</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Minimera</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Maximera</translation>
     </message>
@@ -12934,12 +13517,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 nytt meddelande</translation>
     </message>
@@ -12969,7 +13547,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>%1 kontakter anslutna</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>Vill du verkligen avsluta RetroShare?</translation>
     </message>
@@ -12989,7 +13567,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Visa</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Tillse att den här länken inte leder till en webbsida med skadlig kod.</translation>
     </message>
@@ -13034,13 +13612,12 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Tjänståtkomstmatrix</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13055,7 +13632,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13064,17 +13641,17 @@ Frigör mer diskutrymme och klicka OK.</translation>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Skriv</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Rubrik</translation>
     </message>
@@ -13110,12 +13687,12 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Rubrik 6</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Teckenstorlek</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Öka teckenstorlek</translation>
     </message>
@@ -13130,32 +13707,32 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Fet</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Kursiv</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Justering</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Lägg till en bild</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Anger teckensnitt</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Understruken</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Ämne:</translation>
     </message>
@@ -13166,32 +13743,32 @@ Frigör mer diskutrymme och klicka OK.</translation>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Rekommenderade filer</translation>
     </message>
@@ -13261,7 +13838,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>Lägg till blockcitat</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Skicka till:</translation>
     </message>
@@ -13301,7 +13878,7 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Hej! Jag rekommenderar mina kontakter. Du kan autentisera dem också, när du autentiserar mig.</translation>
     </message>
@@ -13321,18 +13898,18 @@ Frigör mer diskutrymme och klicka OK.</translation>
         <translation>vill bli en av dina kontakter på RetroShare</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Hej %1!&lt;br&gt;&lt;br&gt;%2 vill bli en av dina kontakter på RetroShare.&lt;br&gt;&lt;br&gt;Svara nu:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Tack!&lt;br&gt;RetroShare Team</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>Spara meddelande</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>Meddelandet har inte skickats.
@@ -13344,17 +13921,7 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Klistra in RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>Lägg till i &quot;Till&quot;</translation>
     </message>
@@ -13374,7 +13941,7 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Lägg till som rekommendation</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Ursprungligt meddelande</translation>
     </message>
@@ -13384,21 +13951,21 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Från</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Till</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Kopia</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Skickat</translation>
     </message>
@@ -13413,7 +13980,7 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>På %1, skrev %2:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Svar:</translation>
     </message>
@@ -13423,30 +13990,30 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Vidarebefordran:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Vill du skicka meddelandet utan angivet ämne?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Ange minst en mottagare.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Dold kopia</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Okänd</translation>
     </message>
@@ -13561,13 +14128,13 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Detaljer</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Öppna fil...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML-filer (*.htm *.html);;Alla Filer (*)</translation>
     </message>
@@ -13587,7 +14154,7 @@ Vill du spara meddelandet i Utkast?</translation>
         <translation>Exportera PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>Meddelandet har inte skickats.
@@ -13609,7 +14176,7 @@ Vill du spara meddelandet?</translation>
         <translation>Lägg till fil</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13639,18 +14206,18 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Från:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13690,13 +14257,13 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13706,12 +14273,12 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13789,7 +14356,7 @@ Vill du spara meddelandet?</translation>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Ny flik</translation>
     </message>
@@ -13799,7 +14366,7 @@ Vill du spara meddelandet?</translation>
         <translation>Nytt fönster</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Redigera tagg</translation>
     </message>
@@ -13822,7 +14389,7 @@ Vill du spara meddelandet?</translation>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Ämne:</translation>
     </message>
@@ -13830,7 +14397,7 @@ Vill du spara meddelandet?</translation>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>Meddelande</translation>
     </message>
@@ -13858,7 +14425,7 @@ Vill du spara meddelandet?</translation>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Rekommenderade filer</translation>
     </message>
@@ -13868,37 +14435,37 @@ Vill du spara meddelandet?</translation>
         <translation>Ladda ner alla rekommenderade filer</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Ämne:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Från:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Till:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Kopia:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Dold kopia:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Taggar:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Svara</translation>
     </message>
@@ -13920,7 +14487,7 @@ Vill du spara meddelandet?</translation>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished">Framåt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -13938,7 +14505,7 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13990,7 +14557,7 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>Bekräfta %1 som kontakt</translation>
     </message>
@@ -14000,12 +14567,12 @@ Vill du spara meddelandet?</translation>
         <translation>Lägg till %1 som kontakt</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Inget ämne</translation>
     </message>
@@ -14015,22 +14582,17 @@ Vill du spara meddelandet?</translation>
         <translation>Ladda ner</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14039,24 +14601,14 @@ Vill du spara meddelandet?</translation>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Ladda ner alla</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Skriv ut dokument</translation>
     </message>
@@ -14071,12 +14623,12 @@ Vill du spara meddelandet?</translation>
         <translation>HTML-filer (*.htm *.html);;Alla Filer (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Ladda alltid bilder för detta meddelande</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14098,6 +14650,42 @@ Vill du spara meddelandet?</translation>
         <source>Compose</source>
         <translation>Skriv</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Svara på markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Svara</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Svara alla på markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Svara alla</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Vidarebefordra markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">Vidarebefordra</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Ta bort markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Ta bort</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Skriv ut markerat meddelande</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14176,7 +14764,7 @@ Vill du spara meddelandet?</translation>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Nytt meddelande</translation>
     </message>
@@ -14186,16 +14774,60 @@ Vill du spara meddelandet?</translation>
         <translation>Skriv</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Svara på markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Svara</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Svara alla på markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Svara alla</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Vidarebefordra markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">Vidarebefordra</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Ta bort markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Ta bort</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Skriv ut markerat meddelande</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Skriv ut</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Visa</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Inkorg</translation>
@@ -14225,17 +14857,21 @@ Vill du spara meddelandet?</translation>
         <translation>Papperskorg</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Totalt inkorg:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Mappar</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Snabbvy</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Skriv ut...</translation>
@@ -14245,6 +14881,26 @@ Vill du spara meddelandet?</translation>
         <source>Print Preview</source>
         <translation>Förhandsgranskning</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Endast ikoner</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Text intill ikon</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Endast text</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Text under ikon</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Ange text under ikon</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14266,7 +14922,7 @@ Vill du spara meddelandet?</translation>
         <translation>Vidarebefordra meddelande</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Ämne</translation>
     </message>
@@ -14276,7 +14932,7 @@ Vill du spara meddelandet?</translation>
         <translation>Från</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
@@ -14286,7 +14942,39 @@ Vill du spara meddelandet?</translation>
         <translation>Innehåll</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Klicka för att sortera efter bilagor</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Klicka för att sortera efter ämne</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Klicka för att sortera efter &apos;Lästa&apos;</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Klicka för att sortera efter &apos;Från&apos;</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Klicka för att sortera efter datum</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Klicka för att sortera efter taggar</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Klicka för att sortera efter &apos;Stjärnmärkt&apos;</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Vidarebefordra markerat meddelande</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Sök på ämne</translation>
     </message>
@@ -14295,11 +14983,6 @@ Vill du spara meddelandet?</translation>
         <source>Search From</source>
         <translation>Sök på avsändare</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14326,14 +15009,14 @@ Vill du spara meddelandet?</translation>
         <translation>Sök på bilagor</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Stjärnmärkt</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14407,7 +15090,7 @@ Vill du spara meddelandet?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14421,7 +15104,7 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14436,33 +15119,34 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Utkast</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Till</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Det finns inga stjärnmärkta meddelanden. Stjärnorna ger meddelanden en särskild status, för att dom skall bli lättare att hitta. För att stjärnmärka ett meddelande, klickar du på den grå stjärnan vid sidan av önskat meddelande.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Det finns inga systemmeddelanden.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Till</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Klicka för att sortera efter</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14470,6 +15154,22 @@ Vill du spara meddelandet?</translation>
         <source>Total:</source>
         <translation>Totalt:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">Meddelanden</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">Klicka för att sortera enligt signatur</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Det här meddelandet har blivit signerat och signaturen kollar</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Det här meddelandet har blivit signerat men signaturen stämmer inte</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14497,17 +15197,7 @@ Vill du spara meddelandet?</translation>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14561,7 +15251,7 @@ Vill du spara meddelandet?</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Expandera</translation>
     </message>
@@ -14571,7 +15261,7 @@ Vill du spara meddelandet?</translation>
         <translation>Ta bort objektet</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished">Från</translation>
     </message>
@@ -14606,7 +15296,7 @@ Vill du spara meddelandet?</translation>
         <translation>Väntande</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
@@ -14747,7 +15437,7 @@ Vill du spara meddelandet?</translation>
         <translation>Användar-ID</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Ta bort oanvända nycklar...</translation>
     </message>
@@ -14757,7 +15447,7 @@ Vill du spara meddelandet?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Rensa nyckelringen</translation>
     </message>
@@ -14775,13 +15465,7 @@ Notera: Din gamla nyckelring kommer att säkerhetskopieras.
      Borttagningen kan misslyckas om du kör flera Retroshare-instanser på samma maskin.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Nyckelringsinformation</translation>
@@ -14817,13 +15501,18 @@ För din säkerhet har din nyckelring säkerhetskopierats till filen
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Inkonsistent data i nyckelringen. Detta är troligtvis en bug. Var god och kontakta utvecklarna.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14833,18 +15522,25 @@ För din säkerhet har din nyckelring säkerhetskopierats till filen
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Nätverk</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14871,7 +15567,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14892,7 +15588,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Grupper</translation>
     </message>
@@ -14922,19 +15618,19 @@ Reported error:</source>
         <translation type="unfinished">importera din vänlista inklusive grupper</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">Sök</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14944,12 +15640,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14959,7 +15655,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Grupp</translation>
     </message>
@@ -15074,7 +15770,7 @@ Reported error:</source>
         <translation type="unfinished">Fäll ihop alla</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Vill du ta bort denna nod?</translation>
     </message>
@@ -15084,7 +15780,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Färdig!</translation>
@@ -15191,7 +15887,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15206,7 +15902,11 @@ at least one peer was not added to a group</source>
         <translation>Ta bort alla</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Detta är ett test.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15216,12 +15916,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15276,6 +15976,10 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>Bloggar</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Säkerhet</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15297,6 +16001,10 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>Meddelande</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Anslutningsförsök</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15450,6 +16158,10 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Flöde</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15459,7 +16171,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15479,12 +16191,12 @@ at least one peer was not added to a group</source>
         <translation>Fel lösenord!</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Oregisterad insticks-/programfil</translation>
     </message>
@@ -15499,7 +16211,19 @@ at least one peer was not added to a group</source>
         <translation>Kontrollera din systemklocka.</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Undersöker delade filer...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Hash-beräknar fil</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Sparar filindex...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Testa</translation>
     </message>
@@ -15510,19 +16234,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Okänd titel</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Krypterat meddelande</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15530,7 +16252,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Kontakten ansluten</translation>
     </message>
@@ -15672,12 +16394,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15686,6 +16403,10 @@ p, li { white-space: pre-wrap; }
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">Signera GPG-nyckel</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15722,7 +16443,12 @@ p, li { white-space: pre-wrap; }
         <translation>Inkludera signaturer</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">Alternativ</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15768,21 +16494,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Fel: Kan inte hämta användaruppgifter.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Angiven nyckelalgoritm stöds inte av RetroShare. (För tillfället stöds endast RSA-nycklar)</translation>
@@ -15800,7 +16526,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15869,6 +16595,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Lösenordet kanske är fel</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15876,12 +16606,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15907,7 +16637,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Chatta</translation>
     </message>
@@ -15928,7 +16658,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>Ta bort objektet</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
@@ -15968,7 +16698,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>Skriv meddelande</translation>
     </message>
@@ -15982,6 +16712,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>Kontakten anslöt</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Anslutningsförsök</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16020,13 +16754,17 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Okänd användare</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>Sänd Meddelande</translation>
     </message>
@@ -16193,6 +16931,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulär</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16200,11 +16945,23 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>Fotodelning</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Bild</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Bildtext</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Sammanfattning</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16265,6 +17022,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Lägg till kommentar</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Skriv en kommentar...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16335,6 +17100,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Skapa album</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Visa album</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16356,17 +17125,17 @@ p, li { white-space: pre-wrap; }
         <translation>Bildspel</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Mina album</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Albumprenumerationer</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Delade album</translation>
     </message>
@@ -16396,7 +17165,7 @@ före redigering!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Albumnamn</translation>
     </message>
@@ -16455,19 +17224,19 @@ före redigering!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16503,12 +17272,12 @@ före redigering!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Textetikett</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Visa mer information om det här insticksprogrammet</translation>
     </message>
@@ -16654,6 +17423,44 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Mappar med insticksprogram</translation>
     </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Inget API-nummer. Läs manualen för insticksutveckling.</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Inget SVN-nummer. Läs manualen för insticksutveckling.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Inläsningsfel.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Saknat tecken, fel version?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Det finns inga insticksprogram</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Insticksprogram inläst.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Okänd status.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Markera detta för instick under utveckling.
+De kommer inte att hash-beräknas, vilket i normala
+fall görs som skydd mot skadligt beteende från
+felaktigt utformade insticksprogram. </translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16723,27 +17530,12 @@ p, li { white-space: pre-wrap; }
         <translation>Alltid överst</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16777,6 +17569,14 @@ p, li { white-space: pre-wrap; }
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Om du stänger fönstret kommer konversationen att avslutas, den andra parten meddelas och den krypterade tunneln tas bort.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Ta bort tunneln?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16796,7 +17596,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Nytt</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16816,8 +17616,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Kommentarer</translation>
     </message>
@@ -16842,13 +17642,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished">Kommentar</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16876,12 +17676,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">Signerad av:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Anteckningar</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16896,22 +17704,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Läs in en bildfil</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16927,17 +17725,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16947,7 +17735,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">Skicka</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Skicka</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16967,22 +17763,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16997,7 +17783,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Posta som</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17008,7 +17794,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Bild</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17018,7 +17804,7 @@ p, li { white-space: pre-wrap; }
         <translation>Rubrik</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Länk</translation>
     </message>
@@ -17026,12 +17812,32 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Postade länkar</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Mina rubriker</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Rubrikprenumerationer</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Populära rubriker</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Andra rubriker</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17065,7 +17871,27 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Postad rubrik</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Lägg till rubrikadministratörer</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Välj rubrikadministratörer</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Skapa nytt ämne</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Redigera Ämne</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17103,17 +17929,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17129,7 +17945,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Visa</translation>
     </message>
@@ -17144,17 +17960,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Loading</source>
+        <translation type="vanished">Läser in</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17167,18 +17982,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Webbplats</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Kommentarer</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
@@ -17189,12 +18008,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17204,7 +18023,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17214,17 +18033,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Markera som läst och ta bort objektet</translation>
     </message>
@@ -17234,7 +18057,7 @@ p, li { white-space: pre-wrap; }
         <translation>Nytt</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17244,7 +18067,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -17285,10 +18108,69 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Läser in</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Av</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Formulär</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Het</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nytt</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Topp</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">I dag</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">I går</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Den här veckan</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Den här månaden</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Detta år</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Nästa</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Skapa nytt eller välj ett befintligt signatur-ID först</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Föregående</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17308,17 +18190,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17328,15 +18200,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">okänd</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17346,42 +18218,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17401,7 +18273,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Het</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Sök</translation>
     </message>
@@ -17431,17 +18303,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17456,17 +18328,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished">Kopiera RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17476,31 +18343,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Redigera</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17515,7 +18378,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Prenumerera</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17589,16 +18452,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Inga kanaler markerade</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17607,6 +18460,10 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Flikar</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Öppna varje ämne i en ny flik</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17620,6 +18477,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Postat</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17688,16 +18549,16 @@ p, li { white-space: pre-wrap; }
         <translation>Profilhanterare</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17809,7 +18670,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Redigera statusmeddelande</translation>
@@ -17825,7 +18686,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Profilhanterare</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Publik information</translation>
     </message>
@@ -17860,12 +18721,12 @@ och där läsa in den med importfunktionen.</translation>
         <translation>Ansluten sedan:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Annan information</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Min adress</translation>
     </message>
@@ -17909,27 +18770,51 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Inlägg från:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Konto 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Konto 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Konto 3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Lägg till i Pulse</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">filter</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">URL-Adder</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Visa som</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17939,12 +18824,12 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished">Från:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17974,13 +18859,13 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished">Negativ</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17992,22 +18877,12 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18016,13 +18891,17 @@ och där läsa in den med importfunktionen.</translation>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Posta Pulse till Wire</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18037,24 +18916,34 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Läs in en bildfil</translation>
+        <source>From</source>
+        <translation type="vanished">Från</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Datum</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18065,7 +18954,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished">Formulär</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18084,7 +18973,7 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18094,7 +18983,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18121,7 +19010,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18131,7 +19020,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18151,7 +19040,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18267,7 +19156,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18275,42 +19164,37 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18342,7 +19226,7 @@ och där läsa in den med importfunktionen.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18350,8 +19234,8 @@ och där läsa in den med importfunktionen.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Bekräftelse</translation>
     </message>
@@ -18622,12 +19506,12 @@ Tecknen &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; kommer att ersätt
         <translation>Användarinformation</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Filbegäran avbruten</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Denna version av RetroShare använder OpenPGP-SDK. Som sidoeffekt använder den inte systemets delade PGP-nyckelring, utan har sin egen nyckelring som delas av alla RetroShare-instanser. &lt;br&gt;&lt;br&gt;Du verkar inte ha någon sådan nyckelring, även om GPG-nycklar associeras med befintliga RetroShare-konton, troligen för att du just uppgraderat till denna nya version av programmet.</translation>
     </message>
@@ -18658,7 +19542,7 @@ Tecknen &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; kommer att ersätt
         <translation>Ett oväntat fel uppstod. Rapportera &apos;RsInit::InitRetroShare unexpected return code %1&apos;.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18692,7 +19576,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Flera instanser</translation>
@@ -18713,26 +19597,6 @@ The error reported is:&quot;</source>
  Låsfil:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18813,7 +19677,7 @@ Rapporterat fel är: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18823,7 +19687,7 @@ Rapporterat fel är: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18833,7 +19697,7 @@ Rapporterat fel är: %2</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18849,7 +19713,7 @@ Rapporterat fel är: %2</translation>
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18916,7 +19780,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18944,7 +19808,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19124,29 +19988,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Namn</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Nod</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Status</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19389,18 +20237,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19563,7 +20399,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Nätverksövergripande</translation>
     </message>
@@ -19743,7 +20579,7 @@ p, li { white-space: pre-wrap; }
         <translation>Formulär</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Laddning av inbäddade bilder är blockerad.</translation>
     </message>
@@ -19756,7 +20592,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19929,22 +20765,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19952,12 +20778,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20649,7 +21475,7 @@ Om du tror att den är giltig, ta bort strängen från filen och öppna den på
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Namn</translation>
@@ -20770,7 +21596,7 @@ Om du tror att den är giltig, ta bort strängen från filen och öppna den på
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Namn</translation>
     </message>
@@ -20790,7 +21616,7 @@ Om du tror att den är giltig, ta bort strängen från filen och öppna den på
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20846,7 +21672,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20860,6 +21686,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... Meddelande saknas ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20873,11 +21704,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">Från</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished">Till</translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20900,18 +21726,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Klicka för att sortera efter &apos;Lästa&apos;</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Klicka för att sortera efter &apos;Från&apos;</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20934,9 +21755,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20957,7 +21776,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>Återställer ALLA sparade RetroShare-inställningar.</translation>
     </message>
@@ -21018,7 +21837,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Anger RetroShares språk.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>Kan inte öppna loggfil &apos;%1&apos;: %2</translation>
     </message>
@@ -21039,7 +21858,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Kunde inte skapa datamapp: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Revision</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21069,7 +21892,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21087,7 +21910,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -21104,12 +21927,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Ange nyckelord här (minst 3 tecken)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Starta sökning</translation>
     </message>
@@ -21171,7 +21994,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Rensa</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Nyckelord</translation>
     </message>
@@ -21186,7 +22009,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Sök ID</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Filnamn</translation>
     </message>
@@ -21286,23 +22109,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Nedladdning vald</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Filnamn</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Ladda ner</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>Kopiera RetroShare-länk</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>Skicka RetroShare-länk</translation>
     </message>
@@ -21312,7 +22135,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>Nedladdningsunderrättelse</translation>
     </message>
@@ -21349,7 +22172,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ta bort alla</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Mapp</translation>
@@ -21360,17 +22183,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Ny RetroShare-länk</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Öppna mapp</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Skapa samling...</translation>
     </message>
@@ -21390,7 +22213,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ladda ner från samlingsfil...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Samling</translation>
     </message>
@@ -21398,7 +22221,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Användarinformation</translation>
     </message>
@@ -21414,22 +22237,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Ta bort objektet</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>IP-adress:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Användar-ID</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21446,7 +22269,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Dölj</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21471,8 +22294,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21480,7 +22303,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>vill bli en av dina kontakter på RetroShare</translation>
     </message>
@@ -21511,7 +22334,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Expandera</translation>
     </message>
@@ -21556,12 +22379,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>Skriv meddelande</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Anslutningsförsök</translation>
     </message>
@@ -21581,22 +22404,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Okänt (utgående) anslutningsförsök</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Okänt säkerhetsproblem</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21606,7 +22424,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Okänd användare</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Dölj</translation>
     </message>
@@ -21616,7 +22438,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Vill du verkligen ta bort den här kontakten?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Certifikatet har fel signatur!! Den här klienten är inte vem den utger sig för att vara.</translation>
     </message>
@@ -21626,12 +22448,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>Certifikatet orsakade ett internt fel.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21690,12 +22512,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Lokal adress</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21716,22 +22538,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Lokalt nätverk</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Sökverktyg för externt IP</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Kända / Tidigare IP:</translation>
     </message>
@@ -21747,16 +22569,21 @@ när du ansluter till någon. Att låta det här vara markerat
 bra om du sitter bakom en brandvägg eller en VPN-tunnel.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>Låt RetroShare fråga om min externa IP-adress på dessa sidor:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21766,46 +22593,23 @@ bra om du sitter bakom en brandvägg eller en VPN-tunnel.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21815,7 +22619,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>I2P-adress</translation>
     </message>
@@ -21840,95 +22644,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21943,7 +22689,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished">okänd</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21953,7 +22763,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21965,12 +22790,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21980,7 +22805,7 @@ Also check your ports!</source>
         <translation>Rensa</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21995,23 +22820,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22022,7 +22847,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22032,7 +22867,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22042,7 +22882,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22082,7 +22932,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished">Starta</translation>
     </message>
@@ -22097,7 +22947,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Stopp</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">Inkommande</translation>
     </message>
@@ -22133,32 +22988,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22213,7 +23043,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Totalt:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22238,7 +23068,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22250,7 +23080,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>IP-filter</translation>
     </message>
@@ -22273,7 +23103,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -22333,28 +23163,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22370,18 +23189,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22416,12 +23235,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22444,22 +23263,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22494,7 +23313,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22504,12 +23323,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22589,7 +23408,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>Markera de användare du vill dela privat publiceringsnyckel med.</translation>
     </message>
@@ -22599,12 +23418,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Dela med kontakt</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Dela</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Du kan meddela dina vänner om din kanal genom att dela den med dem.
@@ -22624,7 +23443,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Delade mappar</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22644,17 +23463,17 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation type="unfinished">Synlighet</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">Avbryt</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Lägg till en delad katalog</translation>
     </message>
@@ -22664,7 +23483,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Verkställ och stäng</translation>
     </message>
@@ -22755,7 +23574,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Mappen kan inte hittas, eller ogiltigt mappnamn.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Det här är en lista på delade mappar. Du kan lägga till eller ta bort mappar med knapparna nedantill. När du lägger till en ny katalog så delas alla filer i denna katalog ut. Du kan ange olika rättigheter för varje enskild katalog.</translation>
     </message>
@@ -22763,7 +23582,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Filer</translation>
     </message>
@@ -22814,16 +23633,11 @@ Välj de kontakter du vill dela kanalen med.</translation>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>Kontrollera filer</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Ladda ner markerat</translation>
     </message>
@@ -22833,7 +23647,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Ladda ner</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>Kopiera RetroShare-länk till Urklipp</translation>
     </message>
@@ -22848,7 +23662,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Skicka RetroShare-länk</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22864,7 +23678,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Rekommendation(er)</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Skapa samling...</translation>
     </message>
@@ -22889,7 +23703,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Ladda ner från samlingsfil...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23032,12 +23846,12 @@ Välj de kontakter du vill dela kanalen med.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Läser in konfiguration</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Skapar gränssnitt</translation>
     </message>
@@ -23061,7 +23875,7 @@ Välj de kontakter du vill dela kanalen med.</translation>
         <translation>Kom ihåg lösenordet</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Logga in</translation>
     </message>
@@ -23402,7 +24216,7 @@ This choice can be reverted in settings.</source>
         <translation>Statusmeddelande</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>Meddelande:</translation>
     </message>
@@ -23647,7 +24461,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Ta bort alla taggar</translation>
     </message>
@@ -23683,15 +24497,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23701,13 +24512,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23717,57 +24533,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Fel</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Inte ansluten</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23775,7 +24546,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23785,7 +24556,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23796,12 +24567,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23829,7 +24599,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Överföringsalternativ</translation>
@@ -23840,7 +24610,7 @@ p, li { white-space: pre-wrap; }
         <translation>Max antal samtidiga nedladdningar:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23850,27 +24620,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Dela inkommande automatiskt (Rekommenderas)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23955,7 +24720,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23964,12 +24729,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23994,12 +24754,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Strömmande</translation>
     </message>
@@ -24064,7 +24819,12 @@ p, li { white-space: pre-wrap; }
         <translation>Max antal tunnelförfrågningar per sekund:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24074,17 +24834,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Varning</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24112,7 +24862,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>Nedladdning slutförd</translation>
     </message>
@@ -24136,23 +24886,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">Du har %1 slutförda nedladdningar</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">Du har %1 slutförd nedladdning</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 slutförda nedladdningar</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 slutförd nedladdning</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>Nerladdningar</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Uppladdningar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Namn</translation>
@@ -24359,12 +25125,7 @@ p, li { white-space: pre-wrap; }
         <translation>Specificera</translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Flytta i kön...</translation>
     </message>
@@ -24389,7 +25150,7 @@ p, li { white-space: pre-wrap; }
         <translation>Välj mapp</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24410,7 +25171,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24443,17 +25204,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 är inte slutförd. Är det en mediafil kan du försöka förhandsgranska den.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Varning</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Byt filnamn</translation>
     </message>
@@ -24468,7 +25219,7 @@ p, li { white-space: pre-wrap; }
         <translation>Ange nytt giltigt filnamn</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Expandera alla</translation>
@@ -24595,18 +25346,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Kolumner</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Filöverföringar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Sökväg</translation>
     </message>
@@ -24616,7 +25372,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visa Väg-kolumn</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24626,7 +25382,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Skapa samling...</translation>
     </message>
@@ -24641,7 +25397,7 @@ p, li { white-space: pre-wrap; }
         <translation>Visa samling...</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Samling</translation>
     </message>
@@ -24651,7 +25407,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25065,17 +25821,12 @@ p, li { white-space: pre-wrap; }
         <translation>Formulär</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Status:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25115,27 +25866,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25145,12 +25886,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Webbgränssnitt</translation>
     </message>
@@ -25287,7 +26028,11 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki-sidor</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Ny grupp</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Sidnamn</translation>
     </message>
@@ -25302,7 +26047,7 @@ p, li { white-space: pre-wrap; }
         <translation>Original-ID</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25390,7 +26135,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Sidredigeringshistorik</translation>
     </message>
@@ -25425,7 +26170,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sid-ID</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25455,18 +26200,14 @@ p, li { white-space: pre-wrap; }
         <translation>Taggar</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Historik</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Visa redigeringshistorik</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
@@ -25487,7 +26228,7 @@ p, li { white-space: pre-wrap; }
         <translation>Återställ</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Skicka</translation>
     </message>
@@ -25559,6 +26300,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">Tidsintervall</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25570,7 +26315,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Uppdatera</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25585,7 +26339,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Andra</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25605,7 +26359,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25635,17 +26389,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Förra månaden</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Förra veckan</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">I dag</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Nytt</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">Från</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">tills</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Sök/Filter</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Nätverksövergripande</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Hantera konton</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Visar:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Du själv</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Kontakter</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>Följande</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Anpassad</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">Konto 1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">Konto 2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">Konto 3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">Kryssruta</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Posta Pulse till Wire</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished">RetroShare</translation>
@@ -25708,42 +26530,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Formulär</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">Ta bort</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Plats:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25788,41 +26603,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">N/A</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">Följande</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Okänd</translation>
@@ -25900,7 +26685,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1å %2d</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -25937,7 +26722,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_tr.ts b/retroshare-gui/src/lang/retroshare_tr.ts
index 1163f7149..b0d731573 100644
--- a/retroshare-gui/src/lang/retroshare_tr.ts
+++ b/retroshare-gui/src/lang/retroshare_tr.ts
@@ -84,6 +84,13 @@
         <translation>Yalnızca Gizli Düğüm</translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Yorum Ekle</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: Gelişmiş Arama</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>Arama Ölçütü</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>Başka bir arama ölçütü ekler.</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>Arama ölçütlerini sıfırlar.</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>Aramayı iptal eder.</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>Arama</translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">Albüm Oluştur</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">Albüm Adı:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">Kategori:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">Hayvanlar</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">Aile</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Arkadaşlar</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">Çiçekler</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">Tatil</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">Manzaralar</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">Evcil hayvanlar</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">Portreler</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">Seyahat</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">İş</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">Rastgele</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">Başlık:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Nerede:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">Fotoğrafçı:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Açıklama:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Paylaşım Ayarları</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">İlke:</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">Kalite:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">Yorum:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">Kimlik:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Genel</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">Kısıtlanmış</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">Görselleri Yeniden Boyutlandır (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">Görselleri Yeniden Boyutlandır (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">Orijinal Görselleri Gönder</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">Yorum İzni Yok</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">Kimliği Doğrulanmış Yorumlar</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">Herkes Yorum Yapabilir</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">Kimlikle Yayınla</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; Görsel eklemek için Sürükleyip Bırakın. Ayrıntılarını düzenlemek istediğiniz görsele tıklayın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">Geri</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">Fotoğraf Ekle</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">Albümü Yayınla</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">Başlıksız Albüm</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">Bu albüm hakkında birşeyler yazın...</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">Bu fotoğraflar nerede çekildi ?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">Albüm Küçük Görseli Yükle</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>Albüm</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">Albüm Küçük Görseli</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Özet</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>Başlık</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">Nerede:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">Ne Zaman</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Açıklama:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">Paylaşım Ayarları</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">Yorumlar </translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">Kimliği Yayınla</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">Görünürlük</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation>Uyarı: Buradaki hizmetler henüz deneme aşamasındadır. Bu hizmetleri geliştirmemize yardımcı olun. 
@@ -569,6 +783,14 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <source>Circles</source>
         <translation>Çevreler</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">GxsForumları</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">GxsKanalları</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation>Fotoğraflar</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">Görseli kaydet</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -633,13 +842,17 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">Avatar Ekle</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>Avatar görselinizi ayarlayın</translation>
     </message>
@@ -658,6 +871,10 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">Avatar Yükle</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation>Sıfırlayın</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">Alma Hızı</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">Gönderme Hızı</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>Her zaman üstte</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Biçem</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <source>% Opaque</source>
         <translation>% Mat</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">Kaydedin</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">İptal</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>Başlangıç:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">Ayarlar Gizlensin</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,7 +1063,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -852,12 +1093,12 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Bu iletinin yazarı (%1 kodlu) engellendi.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
@@ -885,7 +1126,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
@@ -943,7 +1184,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">Paylaş</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">İleti Okundu Durumunu Değiştir</translation>
     </message>
@@ -983,7 +1224,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">Yeni</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
@@ -991,12 +1232,12 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">Genişlet</translation>
     </message>
@@ -1042,12 +1283,12 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,17 +1457,17 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>Kanallar</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>Sekmeler</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
@@ -1236,17 +1477,11 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">İndirmeler</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">İletiler artalanda yüklensin (İş Parçacığı)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>Her kanal yeni bir sekmede açılsın</translation>
     </message>
@@ -1254,7 +1489,7 @@ Unutmayın: Buradaki herhangi bir bilgi, iletişim kurallarını güncellediğim
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1512,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
@@ -1302,18 +1537,18 @@ into the image, so as to
         <translation type="unfinished">Avatar</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">Genişlet</translation>
     </message>
@@ -1328,7 +1563,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
     </message>
@@ -1338,7 +1573,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished">Yorumlar</translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">Gizle</translation>
     </message>
@@ -1346,7 +1591,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
@@ -1537,7 +1782,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>Sohbet Odasını Görüntüle</translation>
     </message>
@@ -1549,6 +1794,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>Sohbetler</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">%1 yeni iletiniz var</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">%1 yeni iletiniz var</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 yeni ileti</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 yeni ileti</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1570,14 +1831,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>Bilinmeyen Oda</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>Tümünü Kaldır</translation>
     </message>
@@ -1585,13 +1845,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>Kullanıcı Sayısı</translation>
     </message>
@@ -1601,7 +1861,33 @@ into the image, so as to
         <translation>Konu</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>Abone Olduğunuz Özel Sohbet Odaları</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>Abone Olduğunuz Herkese Açık Sohbet Odaları</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>Özel Sohbet Odaları</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>Herkese Açık Sohbet Odaları</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Sohbet Odaları&lt;/h1&gt;                              	                      &lt;p&gt;Sohbet odaları merkezi olmayan sohbet yerleridir ve IRC gibi çalışır.                                      	                      İsimsiz kimlikle ve arkadaş olmanız gerekmeden tonlarca insanla konuşmanızı sağlar.&lt;/p&gt;                    	                      &lt;p&gt;Bir sohbet odası herkese açık (arkadaşlarınız görebilir) ya da özel (siz çağırmadıkça                                     arkadaşlarınız göremez &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Özel bir odaya çağrıldığınızda içinde arkadaşlarınızın olup olmadığını   	                      görebilirsiniz.&lt;/p&gt;                                                                                               	                      &lt;p&gt;Soldaki listede arkadaşlarınızın                                                                                     	                      bulunduğu sohbet odalarını görebilirsiniz. Ayrıca                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Sağ tıklayarak yeni bir sohbet odası oluşturabilirsiniz.&lt;/li&gt;                                                              		     &lt;li&gt;Bir sohbet odasına girmek ve arkadaşlarınıza göstermek için çift tıklayın&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Not: Sohbet odalarının bilgisayarınızda doğru şekilde çalışması için bilgisayarınızın tarih ve saati doğru olmalıdır. Bu nedenle sistem ayarlarınızı denetleyin!	                      &lt;/p&gt;                                      	                      </translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>Sohbet odası oluştur</translation>
     </message>
@@ -1611,7 +1897,7 @@ into the image, so as to
         <translation>Bu odadan ayrılın</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>İsimsiz olmayan bir kimlik oluşturup bu odaya katılın</translation>
     </message>
@@ -1670,12 +1956,12 @@ Ayrıntıları görmek için soldan bir sohbet odası seçin.
 Odaya katılıp sohbet etmek için çift tıklayın.</translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 sizi %2 adlı sohbet odasına çağırıyor</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>Bu sohbet odası için isimsiz olmayan bir kimlik seçin:</translation>
     </message>
@@ -1685,31 +1971,31 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Bu sohbet odası için bir kimlik seçin:</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">Sohbet odası oluşturun</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[Konu belirtilmemiş]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">Seçilmiş oda bilgileri</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>Özel</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>Herkese Açık</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>İsimsiz kodlar kullanılabilir</translation>
     </message>
@@ -1719,25 +2005,42 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Otomatik Aboneliği Kaldır</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>Otomatik Aboneliği Ekle</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>Sohbet Odası Arama</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>Ad Arama</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">Abone Olundu</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>Sütunlar</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">Evet</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">Hayır</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1749,47 +2052,47 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>Sohbet Odası Adı:</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>Sohbet Odası Kodu:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>Konu:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>Tür:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>Güvenlik:</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>Eşler:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
@@ -1804,24 +2107,13 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>İsimsiz kodlar kullanılamaz</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>Görüntüle</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>sütun</translation>
@@ -1835,7 +2127,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>Ögeyi Kaldır</translation>
     </message>
@@ -1880,22 +2172,46 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">Uzak Sohbet</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>Herkes</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">Kişiler</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>Hiçkimse</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">Şuradan şifreli uzak sohbeti kabul et</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">Sohbet Ayarları</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">Özel Sohbette İfadeler Kullanılabilsin</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">Grup Sohbetinde İfadeler Kullanılabilsin</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>Özel yazı türleri kullanılsın</translation>
     </message>
@@ -1904,6 +2220,10 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Enable custom font size</source>
         <translation>Özel yazı boyutu kullanılsın</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">En küçük yazı boyutu</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1915,7 +2235,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Eğik yazım kullanılsın</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1940,7 +2260,11 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Gömülü görselleri yükle</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">Sohbet Odası</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>Yanıp sönen sekme simgesi</translation>
     </message>
@@ -1949,6 +2273,10 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Do not send typing notifications</source>
         <translation>Yazıyor bildirimleri gönderilmesin</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">Özel Sohbet</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1970,7 +2298,11 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Yanıp sönen pencere/sekme simgesi</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">Sohbet Yazı Türü</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>Sohbet Yazı Türünü Değiştir</translation>
     </message>
@@ -1980,10 +2312,14 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Sohbet Yazı Türü:</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>Geçmiş</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">Biçem</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1998,13 +2334,17 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Variant:</source>
         <translation>Çeşit:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">Grup Sohbeti</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>Özel sohbet</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation>Sohbet için varsayılan yazı türünü seçin.</translation>
     </message>
@@ -2068,28 +2408,22 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Farklı sohbet sistemleri için RetroShare tarafından diskinizde saklanacak sohbet iletisi sayısı ve görüşme geçmişinin ne kadarını görüntüleneceği buradan ayarlanabilir. En fazla saklama süresi, eski iletilerin silinmesini ve sohbet geçmişinin geçici sohbetlerle dolmasını engeller (sohbet odaları ve uzak sohbet gibi).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">Sohbet Odaları</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>Etkin:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished">Arama</translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2099,17 +2433,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">Sohbet odaları</translation>
@@ -2156,7 +2480,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished">Açiklama:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2206,7 +2530,11 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>En fazla saklama süresi, gün olarak (0=sınırsız):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">Varsayılan arama</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>Büyük küçük harfe duyarlı</translation>
     </message>
@@ -2245,6 +2573,10 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Threshold for automatic search</source>
         <translation>Otomatik arama eşiği</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">Sohbet odaları için varsayılan kimlik:</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2312,7 +2644,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>Sohbeti Görüntüle</translation>
     </message>
@@ -2348,7 +2680,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
@@ -2383,12 +2715,12 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation>Yatık</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>Emoticon ekle</translation>
     </message>
@@ -2397,6 +2729,10 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Attach a Picture</source>
         <translation>Görsel Ekle</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2468,6 +2804,11 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <source>Insert horizontal rule</source>
         <translation>Yatay çizgi ekle</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>Görseli kaydet</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2505,7 +2846,7 @@ Odaya katılıp sohbet etmek için çift tıklayın.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>yazıyor...</translation>
     </message>
@@ -2529,7 +2870,7 @@ karakter fazla olacak.</translation>
         <translation>Yazı türünüzü seçin.</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>Geçmişi tamamen silmek istediğinize emin misiniz?</translation>
     </message>
@@ -2579,7 +2920,7 @@ karakter fazla olacak.</translation>
         <translation> Meşgul ve yanıtlamayabilir</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>B/K Harfe Duyarlı Arama</translation>
     </message>
@@ -2601,7 +2942,7 @@ karakter fazla olacak.</translation>
         <translation>X nesne bulunduktan sonra renklendirmeye devam edilsin (daha fazla işlemci gücü gerekir)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;Önceki &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2616,12 +2957,16 @@ karakter fazla olacak.</translation>
         <translation>&lt;b&gt;Bul &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(Durum)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">Metin yazı türü ve rengini ayarlayın</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>Dosya Ekle</translation>
     </message>
@@ -2637,12 +2982,12 @@ karakter fazla olacak.</translation>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;Seçili metni işaretleyin&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation>Kişi kodu:</translation>
     </message>
@@ -2654,12 +2999,12 @@ Double click on it to add his name on text writer.</source>
 Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation>İmzalanmamış</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation> öge bulundu.</translation>
     </message>
@@ -2679,7 +3024,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>Buraya iletinizi yazın</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>Şuradan sonra renklendirme durdurulmasın</translation>
     </message>
@@ -2705,7 +3050,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>Ayrıntılar görüntüleniyor:</translation>
     </message>
@@ -2727,7 +3072,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>Kişisel Çevreler</translation>
     </message>
@@ -2753,7 +3098,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>Arkadaşlar</translation>
     </message>
@@ -2813,7 +3158,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>Arkadaşların Arkadaşları</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>Dış Çevreler (Yönetici)</translation>
     </message>
@@ -2829,7 +3174,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>Çevreler</translation>
     </message>
@@ -2881,48 +3226,43 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>Hata: eş ayrıntıları alınamıyor.</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2934,7 +3274,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>Şifreleme</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>Bağlı değil</translation>
     </message>
@@ -3016,17 +3356,25 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>yok</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;Bu sertifikanın içeriği:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;bir &lt;b&gt;düğüm kodu&lt;/b&gt; ve &lt;b&gt;ad&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">bir &lt;b&gt;onion adresi&lt;/b&gt; ve &lt;b&gt;kapı&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">bir &lt;b&gt;IP adresi&lt;/b&gt; ve &lt;b&gt;kapı&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Yeni arkadaşlar eklemek için bu sertifikayı kullanabilirsiniz. Sertifikayı e-posta ile gönderebilir ya da elden ele verebilirsiniz.&lt;/p&gt;</translation>
     </message>
@@ -3041,7 +3389,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt; tarafından kullanılan şifreleme yöntemi. Arkadaş düğümlerle kurulan bağlantı&lt;/p&gt;&lt;p&gt; her zaman yoğun bir şekilde şifrelenir ve DHE varsa bağlantı &lt;/p&gt;&lt;p&gt;&amp;quot;mükemmel bir yönlendirme gizliliğine&amp;quot;.&lt;/p&gt; sahiptir&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation>ile</translation>
     </message>
@@ -3058,16 +3406,118 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <source>Connect Friend Wizard</source>
         <translation>Arkadaş Bağlantı Yardımcısı</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">Yeni Arkadaş Ekle</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;Arkadaşınızdan bir sertifika dosyası aldıysanız</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;Arkadaşlarınızın seçtiği kişilerle arkadaş olun</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Email 
+ (Your friend will receive an email with instructions how to download RetroShare)</source>
+        <translation type="vanished">&amp;Eposta yoluyla Davetiye gönderin
+(Arkadaşınıza RetroShare indirme bilgilerini içeren bir e-posta gönderilir)</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">İmzalar katılsın</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">Sertifikanızı panoya kopyalayın</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">Sertifikanızı bir dosyaya kaydedin</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">E-posta programını çalıştırın</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>Dosyadan arkadaşınızın Sertifikasını yükleyin</translation>
     </message>
+    <message>
+        <source>Open certificate</source>
+        <translation type="vanished">Sertifika yükleyin</translation>
+    </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">Lütfen, arkadaşınızın RetroShare sertifikasını alttaki kutuya yapıştırın</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">Sertifika dosyaları</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">Dosyalarda kayıtlı PGP sertifikaları kullanılır.</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">Arkadaşınız sertifikasını içe aktarın...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">Sertifikanızın olduğu bir dosya üretip bunu arkadaşınıza ulaştırmalısınız. İsterseniz önceden oluşturulmuş bir dosyayı da kullanabilirsiniz.</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">Sertifikamı dışa aktar...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">Arkadaşınızın sertifikasını sürükleyip bu pencereye bırakın ya da alttaki kutudan dosya yolunu seçin</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">Gözat</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">Arkadaşların arkadaşları</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">Şimdi kiminle arkadaş olmak istediğinizi seçin.</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">Göster:</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">Bu eşlerle arkadaş olun</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare Kodu</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">İletişim ağınızdaki bir arkadaşınızı eklemek için, RetroShare Kodunu kullanın.</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">Arkadaşınızın RetroShare Kodunu Ekleyin...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">Arkadaşınızın RetroShare Kodunu alttaki kutuya yapıştırın</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">Arkadaşınızın RetroShare Kodunu yazın, Eş@BDE8D16A46D938CF gibi</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3109,7 +3559,27 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>E-posta</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">Arkadaşlarınızı e-posta ile çağırın</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">Arkadaşlarınızın e-posta adreslerini yazın (adresleri noktalı virgül ile ayırın)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">Arkadaşlarınızın e-posta adresleri:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">Arkadaşlarınızın E-posta adreslerini yazın</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">Konu:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3125,32 +3595,77 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>İstek hakkında ayrıntılar</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>Eş bilgileri</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>Ad:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">E-posta:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">Düğüm:</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">Lütfen unutmayın, çok fazla arkadaş eklerseniz, RetroShare aşırı miktarda bant genişliğine, belleğe ve işlemci gücüne gerek duyar. İstediğiniz kadar ekleyebilirsiniz, ama 40 arkadaştan fazlası çok fazla kaynağa gerek duyabilir.</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>Konum:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">Bu yardımcı RetroShare ağındaki arkadaşlarınızla bağlantı kurmanızı sağlar. &lt;br&gt;Arkadaşlarınızı nasıl eklemek istediğinizi seçin:</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">Sertifikayı el ile yazın</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">RetroShare kodunu el ile yazın</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">Web Posta Hizmeti &amp;Sunucuları Üzerinden bir Çağrı Gönderin</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">Arkadaşlarınızı diğerlerine önerin</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">RetroShare sertifikası</translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">Lütfen, arkadaşınızın RetroShare sertifikasını aşağıya yapıştırın</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">Sertifikayı yapıştırın</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Arkadaşınızın RetroShare sertifikasını bu kutuya yapıştırın. UYARI: bu sertifika arkadaşınızın profil anahtarından farklıdır. Arkadaşınızın profil anahtarını (bir bölümünü bile) buraya yapıştırmayın, çalışmaz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>Gruba arkadaş ekleyin:</translation>
     </message>
@@ -3160,7 +3675,7 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>Arkadaşı doğrulayın (PGP anahtarını imzalayın)</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3185,22 +3700,16 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>Bağlantı kurulacak arkadaş olarak ekleyin</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">Arkadaşlık isteğini kabul etmek için Tamam üzerine tıklayın.</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>Maalesef, bir sorun çıktı</translation>
     </message>
@@ -3220,27 +3729,32 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
         <translation>Arkadaşınızın bilgileri:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>Anahtar geçerliliği:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>İmzalayanlar</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Bir arkadaşınızın anahtarını imzaladığınızda, diğer arkadaşlarınıza bu arkadaşınıza güvendiğinizi gösterirsiniz. Aşağıdaki imzalar, listelenmiş anahtar sahiplerinin geçerli PGP anahtarını özgün olarak tanındığını şifreli olarak ispatlar.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>Bu eş zaten arkadaş listenizde. Eklerseniz yalnız IP adresi değişebilir.</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3286,17 +3800,49 @@ Adını yazı alanına eklemek için üstüne çift tıklayın.</translation>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>Sertifika Yüklenemedi</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">PGP anahtarı %1 olan eş bilgileri alınamıyor</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">İmzalamadığım eşler</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">Bana güvenmiş olan arkadaşlarımın arkadaşları</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">Reddedilmiş görünen imzalanmış eşler</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">Eş adı</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">Ayrıca imzalayan</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">Eş Kodu</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">Sertifika geçerli görünüyor</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>Geçerli bir Retroshare sertifikası değil!</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare Çağrısı</translation>
     </message>
@@ -3318,12 +3864,12 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>Bu sizin kendi sertifikanız! Kendi kendinizle arakadaş olmak istemezsiniz. Değil mi?</translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3331,7 +3877,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation>Bu anahtar zaten güvenilir listenizde</translation>
     </message>
@@ -3371,7 +3917,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>Şu kişi arkadaşlık isteğinde bulundu</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3396,7 +3942,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3406,7 +3952,47 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">Sertifika yüklenemedi: %1 dosyası bulunamadı</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">%1 eşi ağınızda bulunamadı</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">Yeni sertifika biçimi kullanılsın (güvenli, daha sağlam)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">Eski sertifika biçimi kullanılsın (geriye dönük uyumlu)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">İmzaları kaldır</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">RetroShare Çağrı</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">Arkadaş Bağlantısı Yardımı</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">Bu metni kopyalayarak e-posta ya da başka bir şekilde arkadaşınıza yollayabilirsiniz</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Sertifikanız Panoya kopyalandı, e-postanıza yapıştırarak ya da başka bir şekilde arkadaşınıza iletebilirsiniz</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">Farklı Kaydet...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3445,7 +4031,11 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>*** Yok ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">Olabildiğinde doğrudan kaynak olarak kullanılsın</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>IP Adresi:</translation>
     </message>
@@ -3455,7 +4045,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>IP Adresi</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>Gelişmiş ayarları görüntüle</translation>
     </message>
@@ -3464,6 +4054,10 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Bir arkadaşınızın anahtarını imzaladığınızda, diğer arkadaşlarınıza bu arkadaşınıza güvendiğinizi gösterirsiniz. Böylece arkadaşlarınız bu anahtara güvenme durumunuza göre bağlantıları onaylamaya karar verebilir.  Anahtar imzalama işlemi isteğe bağlıdır ancak geri alınamaz. Bu nedenle ne yaptığınızdan emin olun.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare , doğrudan aktarım yapabilmeniz için düzenli aralıklarla, aktarımlarınızla eşleşen görülebilir dosyalar için arkadaş listenizi kontrol eder. Bu durumda, arkadaşınız dosyayı indirdiğinizi bilebilir.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Bu işlemi yalnızca bu arkadaşınız için engellemek istiyorsanız, kutudaki işareti kaldırın. İsterseniz hala açıkca sorarak doğrudan aktarım yapabilirsiniz, Örneğin arkadaşınızın dosya listesinden indirebilirsiniz. Bu ayar aynı düğümdeki tüm konumlara uygulanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3474,13 +4068,45 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu seçeneği kullanan eşlerin bağlantı adresleri beyaz listede değilse bağlanamazlar. Böylece trafik yönlendirme saldırılarından korunursunuz. Bu seçenek kullanıldığında, reddedilen eşler, Haber Kaynağı &amp;quot;güvenlik akışı ögeleri&amp;quot; bölümünde bildirilir. O bölümden IP adreslerini kara ya da beyaz listeye ekleyebilirsiniz. Aynı düğümdeki tüm konumlara uygulanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">Arkadaşlarınızı birbirine önerin</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">Arkadaş Önerileri</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">Aşağıda RetroShare sertifikanızı görebilirsiniz. Bu metni arkadaşınıza iletmelisiniz</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">İleti:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">Arkadaş önerin</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Kime</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">Önerilecek en az bir arkadaşınızı seçin.</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">Lütfen arkadaşlarınızdan en az birini alıcı olarak seçin.</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>Anahtarı, anahtarlığa ekle</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>Bu anahtar zaten anahtarlığınızda bulunuyor</translation>
     </message>
@@ -3496,7 +4122,7 @@ uzak iletiler göndermek için
 kullanılabilir.</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>Sertifikanın sürüm numarası hatalı. v0.6 ve v0.5 ağlarının birbiriyle uyumlu olmadığını unutmayın.</translation>
     </message>
@@ -3531,7 +4157,7 @@ kullanılabilir.</translation>
         <translation>IP adresini beyaz listeye ekle</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>Bu sertifikada bir IP adresi yok!</translation>
     </message>
@@ -3541,10 +4167,27 @@ kullanılabilir.</translation>
         <translation>&lt;p&gt;Bu sertifikada bir IP adresi yok. IP adresini bulmak için keşif ve DHT özelliğine güvenmelisiniz. Beyaz listeye eklenme zorunlu olsun seçeneğini etkinleştirdiğiniz için Haber Akışı sekmesinde eşle ilgili bir güvenlik uyarısı görüntülenecek. Oraya bakarak eşin IP adresini beyaz listeye alabilirsiniz.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished">[Bilinmiyor]</translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>Sertifikasıyla birlikte %1 üzerinden eklendi</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">Panodan arkadaşınızın Sertifikasını yapıştırın</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">Sertifika Yüklenemedi: %1 dosyası okunamıyor</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">Sertifika Yüklenemedi: %1 dosyasında bir şeyler yanlış</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3606,7 +4249,7 @@ kullanılabilir.</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>UDP Kurulumu</translation>
     </message>
@@ -3642,7 +4285,7 @@ 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;Lucida Grande&apos;; font-size:13pt;&quot;&gt;kapatabilirsiniz.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>Bağlantı Yardımcısı</translation>
     </message>
@@ -3652,20 +4295,17 @@ p, li { white-space: pre-wrap; }
         <translation>Eş Kodu Geçersiz</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>Durum Bilinmiyor</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>Çevrimdisi</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>Simetrik NAT Arkasında</translation>
     </message>
@@ -3675,14 +4315,12 @@ p, li { white-space: pre-wrap; }
         <translation>NAT Arkasında ve DHT Yok</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>Ağı Yeniden Başlat</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>NAT Arkasında</translation>
     </message>
@@ -3692,8 +4330,7 @@ p, li { white-space: pre-wrap; }
         <translation>DHT Yok</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>AĞ DURUMU İYİ!</translation>
     </message>
@@ -3718,7 +4355,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare Eşleri Bulunuyor</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>Arama için DHT gerekli</translation>
     </message>
@@ -4010,7 +4647,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lütfen yeniden tam Sertifikayı içe aktarmayı deneyin</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4018,8 +4655,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kullanılamıyor</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>YÖNLENDİRME DOĞRULANAMIYOR!</translation>
     </message>
@@ -4029,7 +4665,7 @@ p, li { white-space: pre-wrap; }
         <translation>YÖNLENDİRME DOĞRULANAMIYOR ve DHT YOK</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>Aranıyor</translation>
     </message>
@@ -4065,12 +4701,12 @@ p, li { white-space: pre-wrap; }
         <translation>Çevre Ayrıntıları</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tüm çağrılan üyeler, çevre adını, ilgili yöneticiyi ve çağrılan üye listesini görebilir. Çevre özel değil ise bu bilgiler çağrılan üyelerin düğümlerine komşu düğümler tarafından da görülebilir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -4090,7 +4726,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>Kodlar</translation>
     </message>
@@ -4110,18 +4746,18 @@ p, li { white-space: pre-wrap; }
         <translation>Süzgeç</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>Takma Ad</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>Çağrılmış Üyeler</translation>
     </message>
@@ -4136,7 +4772,15 @@ p, li { white-space: pre-wrap; }
         <translation>Bilinen Kişiler</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">Kod</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">Tür</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>Ad:</translation>
     </message>
@@ -4176,19 +4820,23 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Çevreler başka bir çevrenin üyeleriyle kısıtlanabilir. Yalnız bu ikinci çevredeki kişiler yeni çevreyi ve içeriğini (üye listesi, vb) görebilir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">Yalnız şu çevrenin üyelerine görüntülensin:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>Lütfen Çevrenize bir ad verin</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>Herhangi Bir Sınırlama Çevresi Seçilmemiş</translation>
     </message>
@@ -4198,24 +4846,12 @@ p, li { white-space: pre-wrap; }
         <translation>Herhangi Bir Çevre Sınırlaması Seçilmemiş</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Bilinmiyor]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>Ekle</translation>
     </message>
@@ -4225,7 +4861,7 @@ p, li { white-space: pre-wrap; }
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>Arama</translation>
@@ -4240,6 +4876,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>İmzalanmış</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">Bilinen düğümler tarafından imzalanmış</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4256,6 +4896,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP Kodu</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">İsimsiz Kod</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4278,13 +4922,17 @@ p, li { white-space: pre-wrap; }
         <translation>Yeni Çevre Ekle</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>Ekle</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP Bağlantılı Kod</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>Üye Ekle</translation>
     </message>
@@ -4303,7 +4951,7 @@ p, li { white-space: pre-wrap; }
         <translation>Grup Ekle</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>Grup Adı:</translation>
     </message>
@@ -4338,7 +4986,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>Yeni Kanal İletisi</translation>
     </message>
@@ -4348,7 +4996,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal İletisi</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4409,11 +5057,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Yeni dosyaları karmak için, Sürükle Bırak ya da  Dosya Ekleme düğmelerini kullanın.&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Paylaştığınız bölümlerden RetroShare bağlantılarını Kopyalayıp Yapıştırın&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">Dosya Ekle</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>Kanal Küçük Görseli Ekle</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">İleti</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">Konu:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4499,17 +5159,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4528,18 +5188,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">Dosya Zaten Eklenmiş ve Karılmış</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>Lütfen bir konu ekleyin</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>Küçük Görsel Yükle</translation>
     </message>
@@ -4554,12 +5213,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>Toplu veri üret</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>Gerçekten %1 ileti oluşturmak istiyor musunuz?</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>Gerçekte paylaşmadığınız dosyaları eklemek istediğinize emin misiniz?</translation>
     </message>
@@ -4593,7 +5258,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>Forum İletisi Gönder</translation>
     </message>
@@ -4602,6 +5267,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>Forum</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">Konu</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4622,8 +5291,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4642,7 +5311,7 @@ p, li { white-space: pre-wrap; }
         <translation>Eklemek istediğiniz dosyaları sürükleyip bu pencereye bırakabilirsiniz</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4672,17 +5341,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>Forum Yok</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>Şuna Yanıt</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">Başlık</translation>
     </message>
@@ -4736,7 +5405,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished">Görsel Dosyası Yükle</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>Bu forum için uyumlu bir kod bulunamadı</translation>
     </message>
@@ -4746,8 +5415,8 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>Kimliklerinizin hiç biri bu foruma ileti göndermenize izin vermiyor. Bu durum forum kimliklerinizin hiç birini içermeyen bir çevre ile kısıtlanmış olduğundan ya da forum özellikleri PGP imzalı bir kimlik zorunlu olacak şekilde ayarlanmış olduğundan olabilir.</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>Toplu veri üret</translation>
     </message>
@@ -4756,6 +5425,10 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>Gerçekten %1 ileti üretmek istiyor musunuz?</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Gönder</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4770,7 +5443,23 @@ Bu iletiyi silmek istiyor musunuz?</translation>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">Sohbet Odası Oluştur</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">Sohbet odası merkezi olmayan, isimsiz bir sohbet grubudur. Tüm katılımcılar tüm iletileri alabilir. Odayı oluşturduktan sonra Arkadaşlar sekmesinden diğer arkadaşlarınızı çağırabilirsiniz.</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">Oda Adı:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">Oda Konusu:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4805,7 +5494,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">Ekle</translation>
     </message>
@@ -4815,7 +5504,11 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu seçenek işaretlendiğinde bu odaya yalnız PGP imzalı kodlar katılıp konuşabilir. Bu sınırlama sonucunda en azından odadaki bazı kişiler spam gönderenin düğümünü tespit edebileceğinden isimsiz spam gönderenler engellenir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>PGP imzalı kimlikler zorunlu olsun</translation>
     </message>
@@ -4830,7 +5523,11 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>Grup sohbeti yapmak istediğiniz Arkadaşlarınızı seçin.</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">Çağrılan Arkadaşlar</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>Sohbet Odası Ekle</translation>
@@ -4851,7 +5548,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>İlgililer:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>Kullanılacak kimlik:</translation>
     </message>
@@ -4859,17 +5556,17 @@ Bu iletiyi silmek istiyor musunuz?</translation>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>Herkese Açık Bilgiler</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>Ad:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>Konum:</translation>
     </message>
@@ -4879,12 +5576,12 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>Konum Kodu:</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>Yazılım Sürümü:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>Çevrimiçi süresi:</translation>
     </message>
@@ -4904,7 +5601,12 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4914,7 +5616,7 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>Diğer Bilgiler</translation>
     </message>
@@ -4924,12 +5626,17 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>Sertifika</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4939,7 +5646,11 @@ Bu iletiyi silmek istiyor musunuz?</translation>
         <translation>İmzalar katılsın</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">Anahtarı dosyaya kaydet</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">Kimliği Dışa Aktar</translation>
     </message>
@@ -5013,33 +5724,33 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>PGP Parmak İzi:</translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>Düğüm Bilgileri</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP Kodu :</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>Arkadaş Düğümleriniz:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5078,6 +5789,14 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>Node</source>
         <translation>Düğüm</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">Yeni düğüm ekle...</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">istatistik penceresini görüntüle</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5094,6 +5813,10 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;RetroShare bağlantılarda vekil sunucu olarak Bittorrent DHT özelliğini kullanır. IP adresiniz DHT üzerinde &quot;kaydedilmez&quot;. 				                        Bunun yerine DHT, standart DHT istekleri işlenirken arkadaşlarınızın size ulaşması için kullanılır. 												RetroShare arkadaşlarınızın birinden bir DHT yanıtı aldığında durum simgesi yeşile döner.&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5129,7 +5852,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5797,7 +6520,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>Dosyayı başlat</translation>
     </message>
@@ -5805,38 +6528,38 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>hedef</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>büyük küçük harf önemsiz</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>gg.AA.yyyy</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5844,12 +6567,12 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>İfade Gereci</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>Bu ifadeyi sil</translation>
     </message>
@@ -6011,7 +6734,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>Görsel</translation>
     </message>
@@ -6021,7 +6744,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Görüntü</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>Ses</translation>
     </message>
@@ -6081,21 +6804,11 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>C </source>
         <translation>C</translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>Arkadaş Klasörleri</translation>
     </message>
@@ -6217,7 +6930,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation>Kod</translation>
     </message>
@@ -6252,6 +6965,10 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>Show State</source>
         <translation>Durum Görüntülensin</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">Güvenilen düğümler</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6259,7 +6976,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Gruplar Görüntülensin</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>Grup</translation>
     </message>
@@ -6295,7 +7012,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Gruba ekle</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>Arama</translation>
@@ -6311,7 +7028,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Duruma göre sırala</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>Profil bilgileri</translation>
     </message>
@@ -6555,7 +7272,7 @@ en az bir eş bir gruba eklenemedi</translation>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>Arkadaşlık İsteğini Onayla</translation>
     </message>
@@ -6572,6 +7289,10 @@ en az bir eş bir gruba eklenemedi</translation>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">Arama :</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6593,7 +7314,7 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Arkadaş Arama</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>Tümünü işaretle</translation>
     </message>
@@ -6604,134 +7325,16 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Tümünün işaretini kaldır</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished">Ad</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">Durum</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">Arkadaş ol</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished">Vekil sunucu etkinleştirilmemiş ya da bozuk.
-Tüm hizmetler düzgün çalışıyor mu??
-Ayrıca kapı ayarlarınızı da denetleyin!</translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>Durum iletisini düzenle</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>Yayınla</translation>
     </message>
@@ -6814,38 +7417,33 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation>Yazı türünü varsayılana çevir</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>Anahtarlık</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Ağ&lt;/h1&gt; &lt;p&gt;Ağ sekmesi arkadaşınız olan RetroShare düğümlerini: yani size bağlı olan komşu RetroShare düğümlerini görüntüler.&lt;/p&gt; &lt;p&gt;Bilgiye daha iyi erişim sağlamak için düğümleri gruplandırabilirsiniz. Örneğin yalnızca bazı düğümlerin belirli dosyalarınıza erişmesine izin verebilirsiniz.&lt;/p&gt; &lt;p&gt;Sağ tarafta, 3 adet kullanışlı sekme bulacaksınız:&lt;ul&gt; &lt;li&gt;Yayın; bağlı olduğunuz tüm düğümlere aynı anda ileti gönderir&lt;/li&gt; &lt;li&gt;Yerel ağ çizelgesi; keşif bilgilerine bağlı olarak, etrafınızdaki ağı görüntüler&lt;/li&gt; &lt;li&gt;Anahtarlık; genellikle arkadaşlarınız tarafından size yönlendirilmiş, biriktirdiğiniz düğüm anahtarlarını bulundurur.&lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>RetroShare sohbeti yayını: iletiler bağlı olan tüm arkadaşlara gönderilir.</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>Ağ çizelgesi</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>Durum iletinizi buraya yazın.</translation>
     </message>
@@ -6863,17 +7461,7 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation>Parola</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>Tüm alanlara en az 3 karakter yazılmalıdır</translation>
     </message>
@@ -6883,12 +7471,17 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation>Parola ve onayı aynı değil</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>Kapı</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation>BOB kullan</translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>Bu parola PGP için</translation>
@@ -6909,38 +7502,50 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation>Yeni sertifikanız üretilemedi. PGP parolası yanlış olabilir!</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <source>Options</source>
+        <translation type="vanished">Ayarlar</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation>PGP Anahtar Uzunluğu</translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Buraya güçlü bir parola yazın. Bu parola kişisel düğüm anahtarınızı korumak için kullanılacak!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Lütfen olabildiğince fazla rastlantısallık oluşturmak için, farenizi ekranda gezdirin. Düğüm anahtarlarını oluşturmak için yüzde değeri en az %20 olmalıdır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>Standart düğüm</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">TOR/I2P Gizli Düğüm</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Düğüm adınız bu bilgisayarda çalışacak olan RetroShare kopyasını&lt;/p&gt;&lt;p&gt;belirlemek için kullanılır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <source>Use existing profile</source>
+        <translation type="vanished">Varolan profili kullan</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>Düğüm adı</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6960,12 +7565,12 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Profil adı sizi ağda tanımlamak için kullanılır.&lt;/p&gt;&lt;p&gt;Arkadaşlarınızın sizden gelen bağlantıları onaylamasını sağlar.&lt;/p&gt;&lt;p&gt;Aynı profili kullanarak farklı bilgisayarlar üzerinde &lt;/p&gt;&lt;p&gt;birden çok RetroShare düğümü oluşturabilirsiniz.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>Bu profili dışa aktar</translation>
     </message>
@@ -6975,43 +7580,42 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu değer şu formda bir Tor Onion adresi olmalıdır: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;ya da  şu formda bir I2P adresi olmalıdır: [52 karakter].b32.i2p &lt;/p&gt;&lt;p&gt;Bir adres edinmek için Tor ya da I2P uygulamasını yeni bir gizli hizmet / sunucu tüneli oluşturacak şekilde yapılandırmalısınız. &lt;/p&gt;&lt;p&gt;Bu değeri şu anda boş bırakabilirsiniz ancak düğümünüz yalnız Ayarlar-&amp;gt;Ağ-&amp;gt;Gizli Hizmet yapılandırma bölümünden Tor/I2P hizmet adresini doğru olarak ayarlamışsanız çalışır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kimlikler, sohbet odalarında, forumlarda ve kanal yorumlarında yazışırken kullanılır. &lt;/p&gt;&lt;p&gt;Kimlikler ayrıca RetroShare ağı üzerinden e-posta alıp gönderebilir. İmzalanmış bir kimliği&lt;/p&gt;&lt;p&gt;şimdi oluşturabileceğiniz gibi daha sonra gerek duyduğunuz zaman da oluşturabilirsiniz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>Git!</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">Gelişmiş Ayarlar</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>gizli adres</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>Profiliniz bir PGP anahtar çiftiyle ilişkilendirildi. RetroShare şu anda DSA anahtarlarını yok sayıyor.</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bağlantı kapınız.&lt;/p&gt;&lt;p&gt;1024 ile 65535 arasındaki herhangi bir değer&lt;/p&gt;&lt;p&gt;kullanılabilir. Bu değer daha sonra değiştirilebilir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7059,13 +7663,13 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>Profiliniz kaydedilemedi. Bir sorun çıktı.</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>Profili içe aktar</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>Yeni profil ve yeni bir RetroShare düğümü oluştur</translation>
     </message>
@@ -7075,7 +7679,7 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>Yeni bir RetroShare düğümü oluştur</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation>Tor/I2P adresi</translation>
     </message>
@@ -7110,7 +7714,7 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7120,7 +7724,12 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Tüm alanlar geçerli olana kadar düğüm oluşturamazsınız.&lt;/p&gt;</translation>
     </message>
@@ -7130,7 +7739,12 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>&lt;p&gt;Yeteri kadar rasgelelik elde edilene kadar düğüm oluşturamazsınız. En az %20&apos;ye ulaşana kadar, lütfen farenizi oynatmaya devam edin.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation>BOB özelliği aktif I2P adres örneği</translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation>I2P adres örneği</translation>
     </message>
@@ -7356,13 +7970,36 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>Buradan Başlayın</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>Arkadaşlarınızı Çağırın</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;Arkadaşlarınız olmadan RetroShare bir hiçtir. Çağırma işlemini başlatmak için düğmeye tıklayın.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Arkadaşlarınızı &amp;quot;Kimlik sertifikanız&amp;quot; ile çağırın.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Arkadaşlarınızın çağrınızı aldıklarından emin olun... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Arkadaşlarınızı ekleyebilmeniz için hem siz hem de arkadaşınız birbirinizi eklemelisiniz.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>Arkadaşlarınızı RetroShare Üzerine Ekleyin</translation>
     </message>
@@ -7372,103 +8009,124 @@ ve İçe Aktar düğmesini kullanarak yükleyebilirsiniz</translation>
         <translation>Arkadaşlarınızı Ekleyin</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>Arkadaşlarınıza Bağlanın</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&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;
+&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:12pt;&quot;&gt;Arkadaşlarınızla aynı anda çevrimiçi olduğunuzda RetroShare sizi otomatik olarak bağlar!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;İstemcinizin bağlantılar kurabilmesi için önce RetroShare ağını bulması gerekir.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Bu işlem RetroShare ilk kez başlatıldığında 5-30 dakika arasında sürer.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Bağlantılar kurulduğunda DHT göstergesi (Durum Çubuğunda) yeşile döner.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Bir kaç dakika sonra NAT göstergesi (gene Durum Çubuğunda) sarı ya da yeşile döner.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Gösterge kırmızı kalırsa RetroShare bağlantısının kurulmasında zorluk çıkaran bir Güvenlik Duvarı var demektir.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Bu durumda bağlantı kurmakla ilgili ayrıntılı bilgi almak için ilgili yardım bölümüne bakın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>Gelişmiş: Güvenlik Duvarında Kapı Açın</translation>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&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; &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:12pt;&quot;&gt;RetroShare başarımını arttırmak için bir Dış Kapı açabilirsiniz. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Böylece bağlantı kurmayı hızlandırarak daha çok kişinin sizinle bağlantı kurmasını sağlayabilirsiniz. &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Bunu yapmanın en kolay yolu İnternet bağlantısı için kullandığınız modem üzerinde UPnP özelliğini etkinleştirmektir.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;Ayarlar her modem için farklı olduğundan, İnternet üzerinde modem modelinize göre arama yaparak ayarları nasıl yapacağınızı öğrenebilirsiniz.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Bu bilgilerin sizin için bir anlamı yoksa dert etmeyin. RetroShare gene de çalışacaktır.&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&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;
+&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:12pt;&quot;&gt;RetroShare uygulamasını başlatmakta sorun mu yaşıyorsunuz?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) SSS Wiki sayfasına bakın. Buradaki bilgiler biraz eskidi, ancak güncel tutmaya çalışıyoruz..&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Çevrimiçi Forumlara bakın. Soru sorun ve özellikleri tartışın.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) RetroShare İçi Forumları deneyin &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- Bunlar arkadaşlarınıza bağlandığınızda çevrimiçi olur.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) Hala sorun yaşıyorsanız bize e-posta gönderin.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;RetroShare kullanmanın tadını çıkarın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>Arkadaşlarınıza Bağlanın</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&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;
+&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:12pt;&quot;&gt;Arkadaşlarınız size çağrı gönderdiğinde, Arkadaş Ekleme penceresini açmak için tıklayın.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Eklemek istediğiniz arkadaşınızın Kod Sertifikasını pencereye yapıştırın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>Gelişmiş: Güvenlik Duvarında Kapı Açın</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>Ayrıntılı Yardım ve Destek Alın</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>RetroShare Web Sitesini Açın</translation>
     </message>
@@ -7493,7 +8151,7 @@ p, li { white-space: pre-wrap; }
         <translation>E-posta Geri Bildirimi</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare Çağrısı</translation>
     </message>
@@ -7543,12 +8201,12 @@ p, li { white-space: pre-wrap; }
         <translation>RestroShare Geri Bildirimi</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>RetroShare Desteği</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>Canlı sohbet, ileti gönderme gibi pek çok özellik vardır,</translation>
     </message>
@@ -7672,7 +8330,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>Grup Sohbetini Görüntüle</translation>
     </message>
@@ -7680,7 +8338,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[Bilinmiyor]</translation>
     </message>
@@ -7846,11 +8504,19 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>Paylaşarak arkadaşlarınıza forumunuzu duyurabilirsiniz. Forumunuzu paylaşmak istediğiniz arkadaşlarınızı seçin.</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">Konu yönetici izinlerini paylaş</translation>
+    </message>
+    <message>
+        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
+        <translation type="vanished">Arkadaşlarınıza konuyu düzenleme izni verebilirsiniz. Aşağıdaki listeden arkadaşlarınızı seçin. Not: verilen yönetici izinlerinin geri alınamayacağını unutmayın.</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>Başlık</translation>
     </message>
@@ -7863,12 +8529,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>Açıklama</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7893,7 +8559,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">Azalan Düzende Sırala</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">Artan Düzende Sırala</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">Ada Göre Sırala</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">Beğeniye Göre Sırala</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">Son İletiye Göre Sırala</translation>
+    </message>
+    <message>
+        <source>Sort by Number of Posts</source>
+        <translation type="vanished">İleti Sayısına Göre Sırala</translation>
+    </message>
+    <message>
+        <source>Sort by Unread</source>
+        <translation type="vanished">Okunmamışlara Göre Sırala</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>Yöneticisiniz (Düzenle menüsünden ad ve açıklamaları değiştirebilirsiniz)</translation>
     </message>
@@ -7908,14 +8602,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>Son İleti</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
@@ -7926,13 +8620,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>Hiç</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">Görünüm</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7945,7 +8643,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>ve</translation>
     </message>
@@ -8081,7 +8779,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>Kanallar</translation>
@@ -8092,22 +8790,26 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal Ekle</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>Otomatik İndirme Kullanılsın</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>Kanallarım</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Kanallar&lt;/h1&gt;        &lt;p&gt;Kanallar ağa yaymak istediğiniz verileri (film, müzik gibi)  göndermenizi sağlar.&lt;/p&gt;                &lt;p&gt;Arkadaşlarınızın abone olduğu kanalları görebilirsiniz. Abone olduğunuz kanallar da otomatik olarak arkadaşlarınıza iletilir. Böylece ağdaki iyi kanallar öne çıkar.&lt;/p&gt;    &lt;p&gt;Bir kanala yalnız kanalı oluşturan kişi veri gönderebilir. Kanal özel bir kanal değilse ağdaki diğer eşler bu verileri yalnızca okuyabilir. Bununla birlikte veri gönderme ya da okuma izinlerini arkadaşınız oluan RetroShare düğümleri ile paylaşabilirsiniz.&lt;/p&gt;	 &lt;p&gt;Kanallar isimsiz olabileceği gibi bir RetroShare kimliğiyle ilişkilendirilebilir. Böylece okuyucular gerek duyduğunda sizinle iletişim kurabilir. Gönderdiğiniz verilere kullanıcıların yorum yapmasını istiyorsanız &quot;Yorumlar Kullanılsın&quot; seçeneğini etkinleştirin.&lt;/p&gt;    &lt;p&gt;Bu değeri değiştirmediyseniz, kanala gönderilen veriler %1 gün tutulur ve son %2 gündeki veriler eşitlenir.&lt;/p&gt;    </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>Abone Olunan Kanallar</translation>
     </message>
@@ -8127,12 +8829,12 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal indirme klasörünü seçin</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>Otomatik İndirmeyi Devre Dışı Bırak</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>İndirme klasörünü ayarla</translation>
     </message>
@@ -8167,22 +8869,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">Oynat</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>Klasörü aç</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
@@ -8202,17 +8904,17 @@ p, li { white-space: pre-wrap; }
         <translation>Denetleniyor</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>İşlemi iptal edip dosyayı silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>Klasör açılamadı</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">Dosyayı Oynat</translation>
     </message>
@@ -8222,10 +8924,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">%1 dosyası konumda bulunamadı.</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Form</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Dosya Adı</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">Boyut</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Başlık</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">Yayınlanmış</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">Durum</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>Yeni Kanal Ekle</translation>
     </message>
@@ -8263,19 +8992,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Metin Etiketi</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>Kanala Abone Ol</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8289,7 +9008,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -8304,7 +9023,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kanal Açıklaması</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>Yükleniyor</translation>
     </message>
@@ -8319,9 +9038,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">Hiç</translation>
+        <source>New Channel</source>
+        <translation type="vanished">Kanal Ekle</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8332,7 +9050,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>Yeni Yorum:</translation>
     </message>
@@ -8353,7 +9071,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>Oynat</translation>
     </message>
@@ -8409,24 +9127,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>Dosya</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">Uyarı! Bu dosyanın silinmesine %1 saat %2 dakikadan az kaldı. Dosyayı kaydetmeyi düşünün.</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>Yeni</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>Yorum</translation>
     </message>
@@ -8441,17 +9163,21 @@ p, li { white-space: pre-wrap; }
         <translation>Beğenmedim</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">Yükleniyor</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation>Yorumlar</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8476,16 +9202,139 @@ p, li { white-space: pre-wrap; }
         <translation>Ortamı Oynat</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">Kanala Gönder</translation>
+    </message>
+    <message>
+        <source>Add new post</source>
+        <translation type="vanished">Yeni ileti oluştur</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Yükleniyor</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">Kanal Arama</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">Başlık</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">Başlık Arama</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">İleti</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">İleti Arama</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">Dosya Adı</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">Dosya Adı Arama</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">Bir Kanal Seçilmemiş</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">Hiç</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">Herkese Açık</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle &quot;</source>
+        <translation type="vanished">Çevre üyeleri ile kısıtlı &quot;</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle </source>
+        <translation type="vanished">Çevre üyeleri ile kısıtlı</translation>
+    </message>
+    <message>
+        <source>Your eyes only</source>
+        <translation type="vanished">Yalnız sizin gözlerinize</translation>
+    </message>
+    <message>
+        <source>You and your friend nodes</source>
+        <translation type="vanished">Siz ve arkadaş düğümlerinize</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">Otomatik İndirmeyi Devre Dışı Bırak</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">Otomatik İndirmeyi Etkinleştir</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">Akışları görüntüle</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">Dosyaları görüntüle</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">Yönetici:</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">Son İleti:</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">bilinmiyorr</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">Dağıtım:</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">Akış</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">Dosya</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">Abone</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">Açıklama:</translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">Gönderiler (komşu düğümlerden):</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">Kanala Gönder</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished">Yeni ileti oluştur</translation>
     </message>
@@ -8555,7 +9404,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8591,7 +9440,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished">Yorumlar </translation>
     </message>
@@ -8606,13 +9455,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Akış</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8627,7 +9476,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8642,7 +9491,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8702,22 +9551,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8769,7 +9608,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+40"/>
         <source>Public</source>
-        <translation type="unfinished">Herkese Açık</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
@@ -8792,15 +9631,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Siz ve arkadaş düğümlerinize</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
-        <translation type="unfinished">Abone</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
@@ -8835,7 +9673,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+0"/>
         <source>Enable Auto-Download</source>
-        <translation type="unfinished">Otomatik İndirme Kullanılsın</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -8849,17 +9687,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8879,11 +9717,27 @@ p, li { white-space: pre-wrap; }
         <source>Remove Item</source>
         <translation>Ögeyi Sil</translation>
     </message>
+    <message>
+        <source>for identity </source>
+        <translation type="vanished">şu kimlik için</translation>
+    </message>
+    <message>
+        <source>You received a membership request for circle:</source>
+        <translation type="vanished">Şu çevreye üyelik talebi aldınız:</translation>
+    </message>
     <message>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="-33"/>
         <source>Grant membership request</source>
         <translation>Üyelik onayı talebi</translation>
     </message>
+    <message>
+        <source>Revoke membership request</source>
+        <translation type="vanished">Üyelik iptali talebi</translation>
+    </message>
+    <message>
+        <source>You received an invitation for circle:</source>
+        <translation type="vanished">Şu çevreye davet edildiniz:</translation>
+    </message>
     <message>
         <location line="+1"/>
         <location line="+54"/>
@@ -8974,7 +9828,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>Yorum Taşıyıcı</translation>
     </message>
@@ -8987,7 +9841,7 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9017,7 +9871,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yenile</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>Yorum</translation>
@@ -9056,7 +9910,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>Yorumu Yanıtla</translation>
     </message>
@@ -9080,21 +9934,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>Beğenmedim</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9104,7 +9943,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yorum Yap</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9133,10 +9972,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;Yorum&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">İmzalayan</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9165,7 +10020,7 @@ before you can comment</source>
 bir kimlik oluşturmalısınız</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9207,6 +10062,14 @@ bir kimlik oluşturmalısınız</translation>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">Forum Yöneticileri Ekle</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">Forum Yöneticilerini Seçin</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9216,7 +10079,7 @@ bir kimlik oluşturmalısınız</translation>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>Foruma Abone Ol</translation>
     </message>
@@ -9232,7 +10095,7 @@ bir kimlik oluşturmalısınız</translation>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -9252,9 +10115,8 @@ bir kimlik oluşturmalısınız</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Metin Etiketi</translation>
+        <source>Loading</source>
+        <translation type="vanished">Yükleniyor</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9285,13 +10147,13 @@ bir kimlik oluşturmalısınız</translation>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>Konu:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>Forum Aboneliğinden Ayrıl</translation>
     </message>
@@ -9302,7 +10164,7 @@ bir kimlik oluşturmalısınız</translation>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -9322,17 +10184,21 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Şuna Yanıt Olarak:</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">Yükleniyor</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>Forum Akışı</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
@@ -9345,66 +10211,63 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>Seçilmiş Foruma Yeni Konu Ekle</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>Forum Arama</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">Son İleti</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation>Yeni Konu</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>İç İçe Görünüm</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>Düz Görünüm</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>Başlık</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>Yazar</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>Görseli Kaydet</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>Yükleniyor</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9414,7 +10277,12 @@ bir kimlik oluşturmalısınız</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>İletiyi Yanıtla</translation>
     </message>
@@ -9438,6 +10306,10 @@ bir kimlik oluşturmalısınız</translation>
         <source>Download all files</source>
         <translation>Tüm dosyaları indir</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">Sonraki Okunmamış</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9454,23 +10326,35 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Yazar Arama</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">İçerik</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">İçerik Arama</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;Foruma abone olduğunuzda diğer abone olan arkadaşlarınızın gönderilerini alabilir ve forumu tüm diğer arkadaşlarınıza görünür kılabilirsiniz..&lt;/p&gt;&lt;p&gt;İstediğinizde soldaki forum listesine sağ tıklayarak abonelikten ayrılabilirsiniz.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>Adsız</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>Yanıtla</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9513,12 +10397,20 @@ bir kimlik oluşturmalısınız</translation>
         <translation>RetroShare Bağlantısını Kopyala</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">Genişlet</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[Engellenmiş]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[bilinmiyor]</translation>
     </message>
@@ -9548,8 +10440,8 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Yalnız sizin gözlerinize</translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation>Dağıtım</translation>
     </message>
@@ -9563,6 +10455,26 @@ bir kimlik oluşturmalısınız</translation>
         <source>Anti-spam</source>
         <translation>Önemsiz İleti Ayıklama</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... Düzeltilmiş İleti ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">İsimsiz</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">imzalanmış</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">yok</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[... İleti Eksik ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9632,12 +10544,16 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Özgün İleti</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation>Yeni konu</translation>
     </message>
     <message>
-        <location line="+331"/>
+        <source>Read status</source>
+        <translation type="vanished">Okunma durumu</translation>
+    </message>
+    <message>
+        <location line="+318"/>
         <source>Edit</source>
         <translation>Düzenle</translation>
     </message>
@@ -9698,7 +10614,7 @@ bir kimlik oluşturmalısınız</translation>
         <translation>Yazarın değerlendirmesi</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9718,7 +10634,7 @@ bir kimlik oluşturmalısınız</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>Değerlendirme olumlu ise İsimsiz/bilinmeyen iletiler iletilir</translation>
     </message>
@@ -9770,7 +10686,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9780,7 +10696,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9795,7 +10711,29 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <source>Information for this identity is currently missing.</source>
+        <translation type="vanished">Bu kimlikle ilgili bilgiler şu anda eksik.</translation>
+    </message>
+    <message>
+        <source>You have banned this ID. The message will not be
+displayed nor forwarded to your friends.</source>
+        <translation type="vanished">Bu kodu engellediniz. Bu leti arkadaşlarınıza
+görüntülenmeyecek ve iletilmeyecek.</translation>
+    </message>
+    <message>
+        <source>You have not set an opinion for this person,
+ and your friends do not vote positively: Spam regulation 
+prevents the message to be forwarded to your friends.</source>
+        <translation type="vanished">Bu kişiyle ilgili bir değerlendirme yapmamışsınız ve
+arkadaşlarınız da olumlu olarak değerlendirmemiş:
+İstenmeyen ileti kuralı bu iletinin arkadaşlarınıza iletilmesini engeller.</translation>
+    </message>
+    <message>
+        <source>Message will be forwarded to your friends.</source>
+        <translation type="vanished">İleti arkadaşlarınıza iletilecek.</translation>
+    </message>
+    <message>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation>(En yeni)</translation>
     </message>
@@ -9804,6 +10742,10 @@ This message is missing. You should receive it later.</source>
         <source>(Old) </source>
         <translation>(Eski)</translation>
     </message>
+    <message>
+        <source>You cant act on the author to a non-existant Message</source>
+        <translation type="vanished">Var olmayan bir iletinin yazarına işlem yapamazsınız</translation>
+    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -9861,12 +10803,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forumlar&lt;/h1&gt;               			&lt;p&gt;RetroShare Forumları İnternet forumları gibi görünür, ancak merkezi olmayan bir şekilde çalışır.&lt;/p&gt;    			&lt;p&gt;Arkadaşlarınızın abone olduğu forumları görebilir ve abone olduğunuz forumları arkadaşlarınıza iletebilirsiniz. Böylece ilgi gören forumlar ağ üzerinde kendiliğinden üst sıralara çıkar.&lt;/p&gt;                        &lt;p&gt;Başka şekilde yapılandırmadıysanız, forum iletileri %1 gün saklanır ve son %2 gündeki iletiler eşitlenir.&lt;/p&gt;                </translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>Forumlar</translation>
@@ -9897,16 +10839,35 @@ This message is missing. You should receive it later.</source>
         <translation>Diğer Forumlar</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">Bekliyor</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">Alınıyor</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Yükleniyor</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">Simge Ekle</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>Temel alıcılar kısıtlanmış türde gruplar üzerinde yayınlama işlemi yapabilir ve özel türde kanallar üzerinde okuma yayınlama işlemi yapabilir.</translation>
     </message>
@@ -9915,14 +10876,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>Yayınlama Anahtarını Paylaş</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">özel yayın anahtarınızı paylaşacağınız eşleri seçin</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">Anahtarı Şunlarla Paylaş</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>Açıklama</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>İleti Dağıtımı</translation>
     </message>
@@ -9930,7 +10899,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>Herkese Açık</translation>
     </message>
@@ -9949,6 +10918,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>Konu Ekle</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">Zorunlu</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">Şifreli İletiler</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9990,7 +10967,7 @@ This message is missing. You should receive it later.</source>
         <translation>Önemsiz ileti koruması</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>Yorumlar:</translation>
     </message>
@@ -10013,7 +10990,7 @@ This message is missing. You should receive it later.</source>
         <translation>Önemsiz İleti Ayıklama:</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10029,12 +11006,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation>Çevre ile sınırlı:</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation>Arkadaşlarınız ile sınırlı</translation>
     </message>
@@ -10051,23 +11028,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>İleti izleme</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>PGP imzası zorunlu</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>Hiç</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation>Yalnız gruptaki arkadaş düğümleri</translation>
     </message>
@@ -10083,28 +11060,30 @@ This message is missing. You should receive it later.</source>
         <translation>Lütfen bir ad ekleyin</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>Bilinen bir kodun PGP imzası zorunludur</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>Grup Logosunu Yükle</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>Grup Değişikliklerini Gönder</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">Grup Üst Verisi Hazırlanamadı - Lütfen Gözden Geçirin</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">Geri bildirim göndermek için kullanılır</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>Sahip:</translation>
     </message>
@@ -10114,12 +11093,12 @@ This message is missing. You should receive it later.</source>
         <translation>Buraya açıklayıcı bilgiler yazın</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>Bilgiler</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>Kod</translation>
     </message>
@@ -10129,7 +11108,7 @@ This message is missing. You should receive it later.</source>
         <translation>Son İleti</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;İletiler, oluşturduğunuz kanal, forum ya da gönderiye abone olundukça, arkadaş düğümleriniz aracılığı ile yayılır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -10204,12 +11183,7 @@ This message is missing. You should receive it later.</source>
         <translation>İmzasız ve bilinmeyen düğüm kodlarını gözden düşür</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>Beğenilme</translation>
     </message>
@@ -10225,22 +11199,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">Ekle</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>Yazar</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>GxsKodEtiketi</translation>
     </message>
@@ -10248,7 +11227,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>Yükleniyor</translation>
     </message>
@@ -10308,7 +11287,7 @@ This message is missing. You should receive it later.</source>
         <translation>Ayrıntıları Düzenle</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation>İletilerin eşitleneceği süre...</translation>
     </message>
@@ -10365,12 +11344,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <source>Share publish permissions</source>
+        <translation type="vanished">Yayınlama izinlerini paylaş</translation>
+    </message>
+    <message>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare Bağlantısını Kopyala</translation>
     </message>
@@ -10393,7 +11376,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>İmza Yok</translation>
     </message>
@@ -10406,24 +11389,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">Yükleniyor</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>Bulunamadı</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">İmza Yok</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[Engellenmiş]</translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">Doğrulama</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>Anahtar Bilinmiyor</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">isimsiz</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10433,12 +11432,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>Kimlik&amp;nbsp;Adı</translation>
     </message>
@@ -10452,20 +11446,16 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished">Düğüm</translation>
     </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">İmzalayan</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[Bilinmiyor]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10477,7 +11467,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10525,13 +11515,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[Bilinmiyor]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Yükleniyor</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10648,6 +11642,10 @@ This message is missing. You should receive it later.</source>
         <source>Group ID / Author</source>
         <translation>Grup Kodu / Yazar</translation>
     </message>
+    <message>
+        <source>Number of messages / Publish TS</source>
+        <translation type="vanished">İleti sayısı / Yayım Zamanı</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>Local size of data</source>
@@ -10663,6 +11661,10 @@ This message is missing. You should receive it later.</source>
         <source>Popularity</source>
         <translation>Beğenilme</translation>
     </message>
+    <message>
+        <source>Details</source>
+        <translation type="vanished">Ayrıntılar</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/GxsTransportStatistics.cpp" line="+150"/>
         <location line="+13"/>
@@ -10695,6 +11697,41 @@ This message is missing. You should receive it later.</source>
         <translation>Hayır</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">Doğrulanmış tüneller:</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">Tünel Kodu: %1</translation>
+    </message>
+    <message>
+        <source>from: %1</source>
+        <translation type="vanished">şuradan: %1</translation>
+    </message>
+    <message>
+        <source>to: %1</source>
+        <translation type="vanished">şuraya: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">durum: %1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">toplam gönderilen: %1 bayt</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">toplam alınan: %1 bayt</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Eş Bilinmiyor</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10907,12 +11944,48 @@ This message is missing. You should receive it later.</source>
         <source>About</source>
         <translation>Hakkında</translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare Açık Kaynaklı platformlar arası, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;kişisel ve güvenli, merkezi olmayan bir iletişim platformudur.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Kimliği doğrulanmış eşler ağı ve OpenSSL ile şifrelenmiş ilerişim üzerinden &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;arkadaşlarınız ile güvenli sayısal içerik paylaşımı sağlar.&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare dosya paylaşımı, sohbet, iletiler ve kanallar gibi özellikler sunar&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Ayrıntılı bilgi alınabilecek bağlantılar:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Web Sayfası&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Wiki Sayfası&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Forumu&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Proje Sayfası&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Takım Bloğu&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Geliştirici Twitter Hesabı&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+37"/>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10928,7 +12001,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>Geliştiriciler</translation>
     </message>
@@ -10947,7 +12020,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10960,6 +12033,36 @@ 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;&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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Çevirileri:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Web Sitesi Çevirmenleri:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;İsveçce: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Almanca: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Lehçe: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -11025,12 +12128,12 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+121"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+158"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11045,7 +12148,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11054,12 +12157,32 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Did you receive a certificate from a friend?</source>
+        <translation type="vanished">Bir arkadaşınızdan bir sertifika dosyası aldınız mı?</translation>
+    </message>
+    <message>
+        <source>Add friends certificate</source>
+        <translation type="vanished">Arkadaş sertifikasını ekle</translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">Sertifika dosyası ekle</translation>
+    </message>
+    <message>
+        <source>Share your RetroShare Key</source>
+        <translation type="vanished">RetroShare Anahtarınızı Paylaşın</translation>
+    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
+        <translation type="vanished">Aşağıdaki metin sizin RetroShare sertifikanızdır. Bu metni arkadaşlarınıza gönderin</translation>
+    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -11069,12 +12192,20 @@ private and secure decentralized communication platform.
 merkezi olmayan kişisel ve güvenli bir iletişim platformu.</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <source>Launch startup wizard</source>
+        <translation type="vanished">Başlangıç yardımcısını çalıştır</translation>
+    </message>
+    <message>
+        <source>Do you need help with RetroShare?</source>
+        <translation type="vanished">RetroShare hakkında yardıma ihtiyacınız var mı?</translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>Open Web Help</source>
         <translation>Web Yardımını Aç</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>Sertifikanızı Panoya Kopyalayın</translation>
     </message>
@@ -11084,7 +12215,7 @@ merkezi olmayan kişisel ve güvenli bir iletişim platformu.</translation>
         <translation>Sertifikanızı Bir Dosyaya Kaydedin</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>E-posta ile Gönder</translation>
     </message>
@@ -11104,37 +12235,13 @@ merkezi olmayan kişisel ve güvenli bir iletişim platformu.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11146,12 +12253,17 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+16"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11160,11 +12272,19 @@ new short format</source>
         <source>Your Retroshare ID is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;   &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,	  you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;To do so, copy your certificate on this page and send it to friends, and add your friends&apos; certificate.&lt;/p&gt;    &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange 	certificates with a dedicated Retroshare node, through which	  you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;RetroShare uygulamasına hoş geldiniz!&lt;/h1&gt;   &lt;p&gt;&lt;b&gt;Arkadaş&lt;/b&gt; edinmeniz gerek! Bir arkadaş ağı oluşturduğunuzda ya da var olan bir ağa katıldığınızda,	  dosya gönderip almak, sohbet etmek ve forumlarda yazışmak gibi işlemler yapabilirsiniz. &lt;/p&gt;	&lt;div align=center&gt;	&lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;     &lt;/div&gt;   &lt;p&gt;Bunun için, bu sayfadaki sertifikanızı kopyalayıp arkadaşlarınıza gönderin ve arkadaşınızın sertifikasını ekleyin.&lt;/p&gt;    &lt;p&gt;Diğer bir seçenek İnternet üzerinde &quot;Retroshare chat servers&quot; (bağımsız olarak yönetilirler) ifadesini aramaktır. Bu sunucular adanmış bir RetroShare düğümü ile  	sertifika değiş tokuşu yapabilmenizi sağlar. Böylece başka kişilerle	  isimsiz olarak tanışabilirsiniz.&lt;/p&gt; </translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>RetroShare Invite</source>
         <translation>RetroShare Çağrı</translation>
     </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">Sertifikanız Panoya kopyalandı, e-postanıza yapıştırarak ya da başka bir şekilde arkadaşınıza iletebilirsiniz</translation>
+    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -11436,14 +12556,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>Tümü</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>Değerlendirme</translation>
     </message>
@@ -11453,12 +12573,12 @@ p, li { white-space: pre-wrap; }
         <translation>Arama</translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>İsimsiz Kod</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>Yeni kimlik ekle</translation>
     </message>
@@ -11468,7 +12588,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yeni çevre ekle</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>Kişiler</translation>
     </message>
@@ -11483,27 +12603,27 @@ p, li { white-space: pre-wrap; }
         <translation>Kişi</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation>Engelleme seçeneği:</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>Aynı düğüm tarafından imzalanmış tüm kimlikler otomatik engellensin</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation>Arkadaş değerlendirmeleri:</translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>Olumlu değerlendirme</translation>
     </message>
@@ -11519,39 +12639,29 @@ p, li { white-space: pre-wrap; }
         <translation>Olumsuz değerlendirme</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation>Kullanım istatistikleri</translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>Çevreler</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>Çevre adı</translation>
     </message>
@@ -11571,20 +12681,18 @@ p, li { white-space: pre-wrap; }
         <translation>Kişisel Çevreler</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>Kimliği Düzenle</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>Kimliği Sil</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>Bu eş ile sohbet et</translation>
     </message>
@@ -11594,78 +12702,97 @@ p, li { white-space: pre-wrap; }
         <translation>Bu eş ile bir sohbet başlatır</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation>Sahip düğüm kodu :</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>Kimlik adı :</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>()</translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>Kimlik Kodu</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>İleti Gönder</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>Kimlik Bilgileri</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>Kimlik Kodu :</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>Sahip düğüm adı :</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation>Yeni ekle...</translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>Tür:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>Çağrı Gönder</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Komşu düğümlerin bu kimlik hakkında ortalama değerlendirmesi. Olumsuz kötü,&lt;/p&gt;&lt;p&gt;olumlu iyi, sıfır kararsızdır&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>Değerlendirmeniz:</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Bir kimlik hakkındaki değerlendirmeniz, bu kimliğin siz ve arkadaşlarınıza görüntülenmesini belirler. Değerlendirmeniz arkadaşlarınızla paylaşılır ve değerlendirme notunun hesaplanmasında kullanılır: Bir kimlik hakkındaki değerlendirmeniz kararsız ise, değerlendirme notu, arkadaşlarınızın olumlu ve olumsuz değerlendirmeleri arasındaki fark olur. Kararsız değil ise sizin değerlendirmeniz notu belirler.&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Genel not her bir kimliğin sohbet odaları, forumlar ve kanallarda yapabileceği işlemleri belirler. Genel not -1 değerinden düşükse, bu kimlikten gelen ve ona gönderilen tüm forum/kanal iletiler engellenir. Ayrıca kötü değerlendirmelere karşı daha duyarlı bazı forumlarda daha yüksek değerlendirme notu gerektiren özel anti-spam işaretleri bulunur. Engellenen kimliklerin etkinliği yavaşça azalır ve bir süre sonra kaybolur (5 gün sonra).  &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>Olumsuz</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>Kararsız</translation>
     </message>
@@ -11676,17 +12803,17 @@ p, li { white-space: pre-wrap; }
         <translation>Olumlu</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Siz ve arkadaşlarınız için hesaplanmış genel değerlendirme notu.&lt;/p&gt;&lt;p&gt;Olumsuz kötü, olumlu iyi, sıfır kararsızdır. Not çok düşükse,&lt;/p&gt;&lt;p&gt;kimlik kötü olarak işaretlenir ve forumlar, sohbet odaları,&lt;/p&gt;&lt;p&gt;kanallar gibi ögelerin dışında bırakılır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>Genel Değerlendirme:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>İsimsiz</translation>
     </message>
@@ -11701,24 +12828,24 @@ p, li { white-space: pre-wrap; }
         <translation>Kod Arama</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>Bu kimlik size ait</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>Kendi kimliklerim</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>Kişilerim</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation>Ögeleri Görüntüle</translation>
     </message>
@@ -11733,12 +12860,7 @@ p, li { white-space: pre-wrap; }
         <translation>Düğümümle bağlantılı</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>Diğer çevreler</translation>
     </message>
@@ -11748,7 +12870,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üyesi olduğum çevreler</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>Çevre Kodu:</translation>
     </message>
@@ -11823,7 +12945,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üye değil (bu çevrenin verilerine erişemezsiniz)</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>Kimlik Kodu:</translation>
     </message>
@@ -11853,7 +12975,7 @@ p, li { white-space: pre-wrap; }
         <translation>bilinmiyor</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>Çağrılmış</translation>
     </message>
@@ -11868,7 +12990,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üye</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>Çevreyi Düzenle</translation>
     </message>
@@ -11916,7 +13038,7 @@ p, li { white-space: pre-wrap; }
         <translation>Üyeliği onayla</translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11927,7 +13049,7 @@ Bu izden kurtulup yeni bir tane kullanmalısınız.
 Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[Düğüm bilinmiyor]</translation>
@@ -11970,7 +13092,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>İsimsiz kimlik</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12050,7 +13172,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation>bilgiler</translation>
     </message>
@@ -12066,12 +13188,29 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Kimliği panoya kopyala</translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <source>Send invite?</source>
+        <translation type="vanished">Çağrı gönderilsin mi?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Sertifikanız ile bir çağrı göndermek istediğinize emin misiniz?</translation>
+    </message>
+    <message>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>Engellenmiş</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Kimlikler&lt;/h1&gt; 			&lt;p&gt;Bu sekmeden &lt;b&gt;sahte isimsiz kimlikler&lt;/b&gt; ve &lt;b&gt;çevreler&lt;/b&gt; oluşturup düzenleyebilirsiniz. &lt;/p&gt; 			&lt;p&gt;&lt;b&gt;Kimlikler&lt;/b&gt; verilerinizin güvenli olarak tanınmasını sağlamak için forum ve kanal iletilerini imzalamakta 				ve RetroShare iç e-posta sistemini kullanarak geri bildirimleri almak, 				kanal iletilerinden sonra yorum yapmak gibi işlemler için kullanılır&lt;/p&gt; 			&lt;p&gt; Kimlikler isteğe bağlı olarak RetroShare düğümünüzün sertifikası ile &lt;b&gt;imzalanabilir&lt;/b&gt;. 			İmzalanmış kimliklere güvenilmesi daha kolaydır ancak bunlar düğümünüzün IP adresinin kolayca belirlenmesini sağlar.&lt;/p&gt; 			&lt;p&gt;&lt;b&gt;İsimsiz kimlikler&lt;/b&gt; diğer kullanıcılar ile kimliğinizi gizli tutarak etkileşimde bulunmanızı sağlar. Kandırılamazlar 			ancak hiç kimse verilen bir kimliğin gerçek sahibini ispatlayamaz.&lt;/p&gt; 	&lt;p&gt;&lt;b&gt;Çevreler&lt;/b&gt; ağ üzerinde bir alanı paylaşan bir kimlik grubudur (isimsiz ya da imzalanmış). Çevreler 		forum ve kanal gibi ögelerin görüntülenmesini kısıtlamak için kullanılır. &lt;/p&gt; 	&lt;p&gt;Bir &lt;b&gt;çevre&lt;/b&gt; başka bir çevre tarafından  		ya da yalnız kendi üyeleri tarafından görülebilecek şekilde kendi içinde kısıtlanabilir.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Unknown ID:</source>
+        <translation type="vanished">Kod Bilinmiyor :</translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation>olumlu</translation>
     </message>
@@ -12115,11 +13254,19 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>Forums</source>
         <translation>Forumlar</translation>
     </message>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Gönderilme</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>Sohbet</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">Bilinmiyor</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12140,6 +13287,14 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>Creation of author signature in service %1</source>
         <translation>%1 hizmetinin yönetici imzasının oluşturma</translation>
     </message>
+    <message>
+        <source>Message/vote/comment</source>
+        <translation type="vanished">İleti/oy/yorum</translation>
+    </message>
+    <message>
+        <source>%1 in %2 tab</source>
+        <translation type="vanished">%1 %2 sekmesinde</translation>
+    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12160,11 +13315,19 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>Signature in distant tunnel system.</source>
         <translation>Uzak tünel sistemi imzası.</translation>
     </message>
+    <message>
+        <source>Update of identity data.</source>
+        <translation type="vanished">Kimlik verisinin güncellenmesi.</translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>Genel imza doğrulama.</translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">Genel imza.</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12176,7 +13339,11 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Genel şifre çözme.</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <source>Membership verification in circle %1.</source>
+        <translation type="vanished">%1 çevresinde üyelik doğrulama.</translation>
+    </message>
+    <message>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation>Kişilere Ekle</translation>
     </message>
@@ -12226,21 +13393,21 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Merhaba,&lt;br&gt;RetroShare üzerinde sizinle arkadaş olmak istiyorum.&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>Kişiler</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Avatarınız</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>Komşu düğümlerle bağlantılı</translation>
     </message>
@@ -12250,7 +13417,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Uzak düğümlerle bağlantılı</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>Bir arkadaşın RetroShare düğümüyle bağlantılı</translation>
     </message>
@@ -12265,7 +13432,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Bilinmeyen bir RetroShare düğümüyle bağlantılı</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>Bu kişiyle sohbet edin</translation>
     </message>
@@ -12280,12 +13447,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Bu kişi ile uzak sohbet reddedildi.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>Son kullanılma:</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 Bilinen PGP</translation>
     </message>
@@ -12305,12 +13472,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Bu kimliği silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>Sahibi</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>Düğüm adı:</translation>
     </message>
@@ -12320,7 +13487,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Düğüm Kodu:</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>Gerçekten silinsin mi?</translation>
     </message>
@@ -12328,7 +13495,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>Takma ad</translation>
     </message>
@@ -12358,7 +13525,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Takma Ad</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12368,19 +13535,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>Yeni kimlik</translation>
     </message>
@@ -12394,7 +13554,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12404,12 +13564,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Kullanılamıyor</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>Kimliği düzenle</translation>
@@ -12420,27 +13575,27 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished">Güncelle</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12460,7 +13615,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12470,7 +13625,11 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">Anahtar alınamadı!</translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>Anahtar kodu geçersiz</translation>
     </message>
@@ -12485,7 +13644,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Gerçek ad bilinmiyor</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>Yeni Kimlik Oluştur</translation>
     </message>
@@ -12495,15 +13654,10 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Tür</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12529,7 +13683,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Ekle</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">Ekle</translation>
     </message>
@@ -12539,13 +13693,17 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>Avatarınız</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">Avatarı Ayarla</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>Profilinizle bağlantılı</translation>
     </message>
@@ -12555,7 +13713,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Bir ya da bir kaç kimliğiniz olabilir. Kimlikler sohbet odalarında, forumlarda ve kanal yorumlarında yazışırken kullanılır. Uzak sohbet ve RetroShare uzak posta sistemi için hedef olarak kullanılırlar.</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>Takma ad çok kısa. Lütfen en az %1 karakter yazın.</translation>
     </message>
@@ -12614,6 +13772,10 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>PGP name:</source>
         <translation>PGP adı:</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">GXS kodu:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12629,7 +13791,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>Kopyala</translation>
     </message>
@@ -12639,12 +13801,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>Tümünü işaretle</translation>
     </message>
@@ -12663,38 +13825,26 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <source>Quote</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">Gönder</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>Görseli kaydet</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>Dosya adı geçersiz olduğundan görsel kaydedilemiyor</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation>Bu bir görsel değil</translation>
     </message>
@@ -12712,32 +13862,27 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">Kapı:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">Durum:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12758,12 +13903,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12772,31 +13912,26 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>Dosya Aç</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>Klasör Aç</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>Denetleniyor...</translation>
     </message>
@@ -12806,7 +13941,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Dosyaları denetle</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation>Şu kişiye iletiyle öner...</translation>
     </message>
@@ -12834,7 +13969,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>Arkadaş Ekle</translation>
     </message>
@@ -12850,8 +13985,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>Ayarlar</translation>
     </message>
@@ -12872,7 +14006,7 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>Çık</translation>
     </message>
@@ -12883,12 +14017,12 @@ Bu kimliklere yakın zamanda destek verilmeyecek.</translation>
         <translation>Hızlı Başlangıç Yardımcısı</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 merkezi olmayan güvenli bir iletişim platformudur</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>Tamamlanmamış</translation>
     </message>
@@ -12917,12 +14051,11 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>Durum</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>Bildir</translation>
     </message>
@@ -12933,35 +14066,31 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>İletileri Aç</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>Bant Genişliği Çizelgesi</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>Uygulamalar</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>Yardım</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>Küçült</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>Büyüt</translation>
     </message>
@@ -12976,12 +14105,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 yeni ileti</translation>
     </message>
@@ -13011,7 +14135,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>%1 arkadaş bağlı</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>RetroShare uygulamasından çıkmak istiyor musunuz?</translation>
     </message>
@@ -13031,7 +14155,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Görüntüle</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>Bu bağlantının sizi zararlı yazılım bulunduran bir web sitesine yönlendirmediğinden emin olun.</translation>
     </message>
@@ -13076,13 +14200,12 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Hizmet izinleri matrisi</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>İstatistikler</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>Web arayüzünü görüntüle</translation>
     </message>
@@ -13097,7 +14220,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>klasöründe yer azaldı (geçerli sınır</translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>Gerçekten çıkmak istiyor musunuz?</translation>
     </message>
@@ -13106,17 +14229,17 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>Yeni İleti</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>Kişiler</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>Paragraf</translation>
     </message>
@@ -13152,12 +14275,12 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>6. Başlık</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>Yazı Boyutu</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>Yazı boyutunu büyüt</translation>
     </message>
@@ -13172,32 +14295,32 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Koyu</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>Yatık</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>Hizalama</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>Bir görsel ekle</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>Metin yazı türünü kod biçeminde ayarla</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>Altı çizili</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>Konu:</translation>
     </message>
@@ -13208,32 +14331,32 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>Etiketler</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>Adres listesi:</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation>Bu arkadaşı öner</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>Metin rengini ayarla</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>Metin art alan rengini ayarla</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>Önerilen Dosyalar</translation>
     </message>
@@ -13303,7 +14426,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Blok Alıntısı Ekle</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>Kime:</translation>
     </message>
@@ -13327,6 +14450,10 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <source>&amp;Justify</source>
         <translation>&amp;Yanlara</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">Tüm adresler (karışık)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13338,7 +14465,7 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>Kişilerim</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>Merhaba, &lt;br&gt;İyi bir arkadaşımı öneriyorum; bana güveniyorsan ona da güvenebilirsin. &lt;br&gt;</translation>
     </message>
@@ -13358,18 +14485,18 @@ Lütfen biraz boş disk alanı açıp Tamam düğmesine tıklayın.</translation
         <translation>RetroShare üzerinde sizinle arkadaş olmak istiyor</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>Merhaba %1, %2 &lt;br&gt;&lt;br&gt;RetroShare üzerinde seninle arkadaş olmak istiyor. &lt;br&gt;&lt;br&gt;İsteği şimdi yanıtlayabilirsin: &lt;br&gt;%3&lt;br&gt;&lt;br&gt;Teşekkürler,&lt;br&gt;RetroShare Takımı</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>İletiyi Kaydet</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>İleti gönderilemedi
@@ -13381,17 +14508,7 @@ Do you want to save message to draft box?</source>
         <translation>RetroShare Bağlantısını Yapıştır</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>&quot;Kime&quot; alanına ekle</translation>
     </message>
@@ -13411,7 +14528,7 @@ Do you want to save message to draft box?</source>
         <translation>Öneri Olarak Ekle</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>Özgün İleti</translation>
     </message>
@@ -13421,21 +14538,21 @@ Do you want to save message to draft box?</source>
         <translation>Kimden</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>Kime</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>Kopya</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>Gönderildi</translation>
     </message>
@@ -13450,7 +14567,7 @@ Do you want to save message to draft box?</source>
         <translation>%1 zamanında, %2 yazdı:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>Ynt:</translation>
     </message>
@@ -13460,30 +14577,30 @@ Do you want to save message to draft box?</source>
         <translation>İlet:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>Bu iletiyi konusu olmadan mı göndermek istiyorsunuz?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>Lütfen en az bir alıcı ekleyin.</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>Gizli Kopya</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>Bilinmiyor</translation>
     </message>
@@ -13598,13 +14715,13 @@ Do you want to save message to draft box?</source>
         <translation>Ayrıntılar</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>Dosya Aç...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML Dosyaları (*.htm *.html);;Tüm Dosyalar (*)</translation>
     </message>
@@ -13624,7 +14741,7 @@ Do you want to save message to draft box?</source>
         <translation>PDF Olarak Dışa Aktar</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>İleti gönderilemedi
@@ -13646,7 +14763,7 @@ Do you want to save message ?</source>
         <translation>Başka Dosya Ekleyin</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>Merhaba,&lt;br&gt;RetroShare üzerinde sizinle arkadaş olmak istiyorum.&lt;br&gt;</translation>
     </message>
@@ -13670,24 +14787,28 @@ Do you want to save message ?</source>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">Bir arkadaşlık isteğiniz var</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>Şimdi yanıtlayın:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>Kimden:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>Arkadaş Düğümleri</translation>
     </message>
@@ -13732,13 +14853,13 @@ Do you want to save message ?</source>
         <translation>Sıralı liste (büyük romen)</translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>Teşekkürler, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>Uzak kimlik:</translation>
     </message>
@@ -13748,12 +14869,12 @@ Do you want to save message ?</source>
         <translation>[Eksik]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>Lütfen uzak iletileri imzalamak için bir kimlik oluşturun ya da hedef listesinden uzak eşleri kaldırın.</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>Düğüm adı ve kodu:</translation>
     </message>
@@ -13831,7 +14952,7 @@ Do you want to save message ?</source>
         <translation>Varsayilan</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>Yeni sekmede</translation>
     </message>
@@ -13841,7 +14962,7 @@ Do you want to save message ?</source>
         <translation>Yeni pencerede</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>Etiketi Düzenle</translation>
     </message>
@@ -13864,7 +14985,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>Konu:</translation>
     </message>
@@ -13872,7 +14993,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>İleti</translation>
     </message>
@@ -13900,7 +15021,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>Önerilen Dosyalar</translation>
     </message>
@@ -13910,37 +15031,37 @@ Do you want to save message ?</source>
         <translation>Önerilen Tüm Dosyaları İndir</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>Konu:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>Kimden:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>Kime:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>Kopya:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>Gizli Kopya:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>Etiketler:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">Yanıtla</translation>
     </message>
@@ -13962,7 +15083,7 @@ Do you want to save message ?</source>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished">İleri</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -13980,7 +15101,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>Çağrı Gönder</translation>
     </message>
@@ -14024,7 +15145,7 @@ Do you want to save message ?</source>
         <location line="+5"/>
         <location line="+3"/>
         <source>Buttons Text Beside Icon</source>
-        <translation type="unfinished">Düğme Simgelerinin Yanında Metin</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
@@ -14032,7 +15153,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>%1 kullanıcısını arkadaş olarak onayla</translation>
     </message>
@@ -14042,12 +15163,12 @@ Do you want to save message ?</source>
         <translation>%1 kullanıcısını arkadaş olarak ekle</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>Konu yok</translation>
     </message>
@@ -14057,22 +15178,17 @@ Do you want to save message ?</source>
         <translation>Indir</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14082,23 +15198,21 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
+        <source>Send invite?</source>
+        <translation type="vanished">Çağrı Gönder</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Sertifikanız ile bir çağrı göndermek istediğinize emin misiniz?</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>Tümünü indir</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>Belgeyi Yazdır</translation>
     </message>
@@ -14113,12 +15227,12 @@ Do you want to save message ?</source>
         <translation>HTML Dosyaları (*.htm *.html);;Tüm Dosyalar (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>Bu iletideki görseller her zaman yüklensin</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>Dosya ekleme panosu gizlensin</translation>
     </message>
@@ -14140,6 +15254,42 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>Yeni İleti</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Seçilmiş iletiyi yanıtla</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Yanıtla</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Seçilmiş iletinin tüm alıcılarını yanıtla</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Tümünü yanıtla</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Seçilmiş iletiyi ilet</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">İlet</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Seçilmiş iletiyi sil</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Sil</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Seçilmiş iletiyi yazdır</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14218,7 +15368,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>Yeni İleti</translation>
     </message>
@@ -14228,16 +15378,60 @@ Do you want to save message ?</source>
         <translation>Yeni İleti</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">Seçilmiş iletiyi yanıtla</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">Yanıtla</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">Seçilmiş iletinin tüm alıcılarını yanıtla</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">Tümünü yanıtla</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">Seçilmiş iletiyi ilet</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">İlet</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">Seçilmiş iletiyi sil</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">Sil</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">Seçilmiş iletiyi yazdır</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">Yazdır</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">Görünüm</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>Etiketler</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>Gelen</translation>
@@ -14267,17 +15461,21 @@ Do you want to save message ?</source>
         <translation>Çöp</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>Toplam Gelen:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">Klasörler</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>Hızlı Görünüm</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>Yazdır...</translation>
@@ -14287,6 +15485,26 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>Baskı Önizleme</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">Yalnız Düğme Simgeleri</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">Düğme Simgelerinin Yanındaki Metin</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">Düğme Üzerindeki Metin</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">Simgenin Altındaki Düğme Metni</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">Simge Altındaki Metni Ayarlayın</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14308,7 +15526,7 @@ Do you want to save message ?</source>
         <translation>İletiyi İlet</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>Konu</translation>
     </message>
@@ -14318,7 +15536,7 @@ Do you want to save message ?</source>
         <translation>Kimden</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
@@ -14328,7 +15546,39 @@ Do you want to save message ?</source>
         <translation>İçindekiler</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">Dosya eklerine göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">Konuya göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">Okunmuş durumuna göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">Gönderene göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">Tarihe göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">Etiketlere göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">Yıldızlara göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">Seçilmiş iletiyi ilet</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>Konu Arama</translation>
     </message>
@@ -14337,11 +15587,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>Gönderen Arama</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14368,14 +15613,14 @@ Do you want to save message ?</source>
         <translation>Dosya Eki Arama</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;İletiler&lt;/h1&gt;                          &lt;p&gt;RetroShare kendi iç posta sistemine sahiptir. Bağlantılı arkadaş düğümleri ile e-posta alışverişi yapılabilir.&lt;/p&gt;  &lt;p&gt;Genel yöneltme sistemini kullanarak diğer kişilerin kimliklerine de ileti gönderilebilir. Bu iletiler her zaman şifrelenip imzalanır ve hedefe ulaşmadan önce ara düğümlerden geçirilir. &lt;/p&gt;    &lt;p&gt;Onay alındısı gelene kadar uzak iletiler Giden kutusunda kalır.&lt;/p&gt; &lt;p&gt;Genel olarak iletiler arkadaşlarınızla dosya bağlantılarını paylaşmak, ağınızı güçlendirmek için arkadaş düğümlerini başka arkadaş düğümlerine önermek ya da bir kanal sahibine geri bildirim göndermek için kullanılabilir.&lt;/p&gt;                    </translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>Yıldızlı</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14449,7 +15694,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14463,7 +15708,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14478,33 +15723,38 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>Taslaklar</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>Kime</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">Henüz yıldızlı bir ileti yok. Kolayca ayırt etmek istediğiniz iletilere yıldız ekleyebilirsiniz. Yıldız eklemek için bir iletinin yanındaki açık gri yıldıza tıklayın.</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">Henüz bir sistem iletisi yok.</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">Kime</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">Alıcıya göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>This message goes to a distant person.</source>
+        <translation type="vanished">Bu ileti uzaktaki bir kişiye gönderiliyor.</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14512,6 +15762,26 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>Toplam:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">İletiler</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">İmzaya göre sıralamak için tıklayın</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">Bu ileti imzalanmış ve imza denetlenmiş</translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">Bu ileti imzalanmış ancak imza denetlenmemiş</translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">Bu ileti uzak bir kişiden geliyor.</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14539,17 +15809,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">Görseli kaydet</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>Düz metin olarak yapıştır</translation>
     </message>
@@ -14603,7 +15863,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -14613,7 +15873,7 @@ Do you want to save message ?</source>
         <translation>Ögeyi Sil</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation>kimden</translation>
     </message>
@@ -14648,10 +15908,18 @@ Do you want to save message ?</source>
         <translation>Bekleyen İleti</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
+    <message>
+        <source>Send invite?</source>
+        <translation type="vanished">Çağrı gönderilsin mi?</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">Sertifikanız ile bir çağrı göndermek istediğinize emin misiniz?</translation>
+    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -14789,7 +16057,7 @@ Do you want to save message ?</source>
         <translation>Eş Kodu</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>Kullanılmayan anahtarları sil...</translation>
     </message>
@@ -14799,7 +16067,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>Anahtarlığı temizle</translation>
     </message>
@@ -14818,13 +16086,7 @@ Notlar: Eski anahtarlığınız yedeklenecek.
 Aynı bilgisayarda birden çok RetroShare kopyası çalışıyorsa silme işlemi tamamlanamayabilir.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>Anahtarlık bilgileri</translation>
@@ -14860,13 +16122,18 @@ Güvenlik için anahtarlığınız dosyaya yedeklendi
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>Anahtarlık verileri tutarlı değil. Bu sorun bir hatadan kaynaklanıyor olabilir. Lütfen yazılımı geliştirenler ile görüşün.</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>Yeni bir düğüm dışa aktar/oluştur</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>Yalnız güvenilen anahtarlar</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>Ad Arama</translation>
     </message>
@@ -14876,12 +16143,12 @@ Güvenlik için anahtarlığınız dosyaya yedeklendi
         <translation>Eş Kodu Arama</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>Profil ayrıntıları...</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14890,6 +16157,13 @@ Reported error:</source>
 Bildirilen hata:</translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">Ağ</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14916,7 +16190,7 @@ Bildirilen hata:</translation>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14937,7 +16211,7 @@ Bildirilen hata:</translation>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">Gruplar</translation>
     </message>
@@ -14967,19 +16241,19 @@ Bildirilen hata:</translation>
         <translation type="unfinished">arkadaş listenizi gruplarla birlikte içe aktarın</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished">Arama</translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">Kod</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14989,12 +16263,12 @@ Bildirilen hata:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished">Ögeleri Görüntüle</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15004,7 +16278,7 @@ Bildirilen hata:</translation>
         <translation type="unfinished">IP Adresi</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">Grup</translation>
     </message>
@@ -15119,7 +16393,7 @@ Bildirilen hata:</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">Bu düğümü silmek istiyor musunuz?</translation>
     </message>
@@ -15129,7 +16403,7 @@ Bildirilen hata:</translation>
         <translation type="unfinished">Bu Arkadaşı silmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">Tamam!</translation>
@@ -15243,7 +16517,11 @@ en az bir eş bir gruba eklenemedi</translation>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">Günlük kayıtları</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15258,7 +16536,11 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Tümünü Kaldır</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">Bu bir denemedir.</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>Yeniden eskiye</translation>
     </message>
@@ -15268,12 +16550,20 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Eskiden yeniye</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Haber Akışı&lt;/h1&gt;                                                             &lt;p&gt;Haber Akışı ağınızdaki son gelişmeleri aldığınız tarihe göre sıralayarak görüntüler. Bu özellik arkadaşlarınızın yaptığı işlemlerin bir özetini verir. Hangi işlemlerin görüntüleneceğini seçmek için &lt;b&gt;Ayarlar&lt;/b&gt; üzerine tıklayabilirsiniz. &lt;/p&gt;                                         &lt;p&gt;Seçenekler şunlardır:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Bağlanma girişimleri (yeni kişiler ile arkadaş olmak ve size ulaşmaya çalışanları görmek için)&lt;/li&gt;    &lt;li&gt;Kanal ve Forum iletileri&lt;/li&gt;                                                                               &lt;li&gt;Abone olabileceğiniz yeni kanal ve forumlar&lt;/li&gt;                                                          &lt;li&gt;Arkadaşlarınızdan gelen özel iletiler&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="vanished">Haber</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15328,6 +16618,10 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Blogs</source>
         <translation>Bloglar</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">Güvenlik</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15349,6 +16643,10 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Message</source>
         <translation>İleti</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">Bağlanma girişimi</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15365,6 +16663,10 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Ip security</source>
         <translation>IP güvenliği</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">Haber</translation>
+    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -15375,6 +16677,10 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Circles</source>
         <translation>Çevreler</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Bağlantılar</translation>
+    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -15427,6 +16733,26 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Chat rooms</source>
         <translation>Sohbet odaları</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">Sohbet Odaları</translation>
+    </message>
+    <message>
+        <source>Count occurrences of my current identity</source>
+        <translation type="vanished">Geçerli kimliğimi içerenler sayılsın</translation>
+    </message>
+    <message>
+        <source>Count occurrences of any of the following texts (separate by newlines):</source>
+        <translation type="vanished">Şu metinlerden herhangi birini içerenler sayılsın (her metni ayrı bir satıra yazın):</translation>
+    </message>
+    <message>
+        <source>Checked, if the identity and the text above occurrences must be in the same case to trigger count.</source>
+        <translation type="vanished">Denetlendi, sayının arttırılması için kimlik ve yukarıdaki metin aynı olmalıdır.</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="vanished">Büyük küçük harfe duyarlı</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15502,16 +16828,24 @@ en az bir eş bir gruba eklenemedi</translation>
         <source>Disable All Toaster temporarily</source>
         <translation>Tüm Bildirimleri geçici olarak devre dışı bırak</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">Akış</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>Sistem Tepsisi</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">Tüm okunmamış iletiler sayılsın</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation>Parola zorunludur</translation>
     </message>
@@ -15531,12 +16865,12 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Parola Yanlış !</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>Lütfen RetroShare parolanızı yazın</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>Kaydedilmemiş eklenti ya da çalıştırılabilir dosya</translation>
     </message>
@@ -15551,7 +16885,19 @@ en az bir eş bir gruba eklenemedi</translation>
         <translation>Lütfen sistem saatini denetleyin</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">Paylaşılan dosyalar inceleniyor...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">Dosya karılıyor</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">Dosya dizini kaydediliyor...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>Deneme</translation>
     </message>
@@ -15562,19 +16908,17 @@ en az bir eş bir gruba eklenemedi</translation>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>Başlık bilinmiyor</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>Şifreli ileti</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>Sohbet odalarının düzgün çalışması için bilgisayarınızın saatinin doğru olması gerekir. Lütfen sorunun bu olup olmadığını denetleyin (arkadaşlarınızla bir kaç dakikalık saat farkınız olabileceği algılandı).</translation>
     </message>
@@ -15582,7 +16926,7 @@ en az bir eş bir gruba eklenemedi</translation>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>Arkadaş Çevrimiçi</translation>
     </message>
@@ -15634,6 +16978,10 @@ Düşük Trafik: %10 standart trafik ve YAPILACAK: tüm dosya aktarımları dura
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">Pencere</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15699,6 +17047,10 @@ Düşük Trafik: %10 standart trafik ve YAPILACAK: tüm dosya aktarımları dura
         <source>This profile has signed your own profile key</source>
         <translation>Bu profil kendi profil anahtarınız ile imzalanmış</translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">Anahtar imzaları :</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15728,20 +17080,23 @@ p, li { white-space: pre-wrap; }
         <translation>PGP anahtarı</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation>Bu seçenekler profildeki tüm düğümlere uygulanır:</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Bir arkadaşınızın anahtarını imzaladığınızda, diğer arkadaşlarınıza bu arkadaşınıza güvendiğinizi gösterirsiniz. Böylece arkadaşlarınız bu anahtara güvenme durumunuza göre bağlantıları onaylamaya karar verebilir.  Anahtar imzalama işlemi isteğe bağlıdır ancak geri alınamaz. Bu nedenle ne yaptığınızdan emin olun.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">PGP anahtarını imzala</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15778,7 +17133,12 @@ p, li { white-space: pre-wrap; }
         <translation>Imzalar katılsın</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>Seçenekler</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare , doğrudan aktarım yapabilmeniz için düzenli aralıklarla, aktarımlarınızla eşleşen görülebilir dosyalar için arkadaş listenizi kontrol eder. Bu durumda, arkadaşınız dosyayı indirdiğinizi bilebilir.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;Bu işlemi yalnızca bu arkadaşınız için engellemek istiyorsanız, kutudaki işareti kaldırın. İsterseniz hala açıkca sorarak doğrudan aktarım yapabilirsiniz, Örneğin arkadaşınızın dosya listesinden indirebilirsiniz. Bu ayar aynı düğümdeki tüm konumlara uygulanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -15792,6 +17152,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu seçenek, bu düğümden gelen bir iletide önerilen bir dosyanın otomatik olarak indirilmesini sağlar. Bu işlem örneğin kendi düğümleriniz arasında dosya göndermek gibi amaçlarla kullanılabilir. Aynı düğümdeki tüm konumlara uygulanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15824,21 +17188,21 @@ p, li { white-space: pre-wrap; }
         <translation> kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>Hata: eş ayrıntıları alınamadı.</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>Verilen anahtar algoritmasi RetroShare tarafından desteklenmiyor
@@ -15859,7 +17223,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>Güvenilirlik düzeyi bu anahtara güveninizi göstermenin bir yoludur. Yazılım tarafından kullanılmaz ya da paylaşılmaz ancak iyi ve kötü anahtarları anımsamanıza yardımcı olur.</translation>
     </message>
@@ -15928,6 +17292,10 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">Parola yanlış olabilir</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15935,12 +17303,12 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>RetroShare profili</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>Bu sizin kendi PGP anahtarınız ve imzalayan :</translation>
     </message>
@@ -15966,7 +17334,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>Sohbet</translation>
     </message>
@@ -15987,7 +17355,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>Ögeyi Sil</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>Ad:</translation>
     </message>
@@ -16027,7 +17395,7 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>İleti Yaz</translation>
     </message>
@@ -16041,6 +17409,10 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>Friend Connected</source>
         <translation>Arkadaş Bağlandı</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">Bağlantı Girişimi</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16079,13 +17451,17 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Bilinmeyen Eş</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>İleti Gönder</translation>
     </message>
@@ -16137,6 +17513,10 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>Chat with this person as...</source>
         <translation>Bu kişiyle şu kimlikle sohbet et...</translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">Bu kişiye ileti gönder</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -16195,6 +17575,10 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ayarlanmadığında, kişi listenizdeki herkes olumlu olarak değerlendirilir. Böylece kullanılan düğümlerin değerlendirmesi otomatik olarak yükseltilir. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
+        <translation type="vanished">kişilerim otomatik olarak &quot;Olumlu&quot; değerlendirilsin</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -16252,6 +17636,13 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forum ya da kanal gibi ortamlarda kullanıldıklarından engellenip silinmiş kimliklerin geri gelmesini önlemek için engellenmiş kimlikler bir süre için bir listede tutulur. Bu sürenin sonunda engelleme listesinden &amp;quot;temizlenerek&amp;quot; forum, sohbet odası gibi yerlerde kullanılıyorlarsa yeniden indilrilirler.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Form</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16259,11 +17650,23 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>PhotoShare</source>
         <translation>PhotoShare</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">Fotoğraf</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">Yorum</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">Özet</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16324,6 +17727,14 @@ Uyarı: Dosya-Aktarımı ayarlarınızda, doğrudan indirmeye İzin verilmemiş.
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">Yorum Ekle</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">Yorum yaz...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16394,6 +17805,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>Albüm Ekle</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">Albümü Görüntüle</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16415,17 +17830,17 @@ p, li { white-space: pre-wrap; }
         <translation>Saydam Sunumu</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>Albümlerim</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>Abone Olunan Albümler</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>Paylaşılan Albümler</translation>
     </message>
@@ -16455,7 +17870,7 @@ lütfen bir albüm seçin!</translation>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>Albüm Adı</translation>
     </message>
@@ -16514,19 +17929,19 @@ lütfen bir albüm seçin!</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16562,12 +17977,12 @@ lütfen bir albüm seçin!</translation>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>Metin Etiketi</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>Bu uygulama eki ile ilgili ayrıntılı bilgilere bakın</translation>
     </message>
@@ -16713,6 +18128,60 @@ p, li { white-space: pre-wrap; }
         <source>Plugin look-up directories</source>
         <translation>Uygulama eklerinin aranacağı klasörler</translation>
     </message>
+    <message>
+        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
+        <translation type="vanished">Uygulama eki devre dışı. Etkinleştir düğmesine tıklayıp RetroShare yazılımını yeniden başlatın</translation>
+    </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[Devre Dışı]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Herhangi bir API numarası belirtilmemiş. Lütfen uygulama eki geliştirme kılavuzunu okuyun.</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[yükleme sorunu]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">Herhangi bir SVN numarası belirtilmemiş. Lütfen uygulama eki geliştirme kılavuzunu okuyun.</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">Yükleme hatası.</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">Simge eksik. Sürüm yanlış olabilir mi?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">Herhangi bir uygulama eki nesnesi yok</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">Uygulama ekleri yüklendi.</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">Durum bilinmiyor.</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">Uygulama eki geliştirirken bu seçeneği işaretleyin.
+Böylece karma denetimi yapılmaz. Ancak
+normal zamanlarda karma denetimi sizi
+uygulama eklerinde bulunabilecek zararlı yazılımlardan korur.</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Uygulama&amp;nbsp;Ekleri&lt;/h1&gt;                   &lt;p&gt;Uygulama ekleri aşağıdaki listedeki klasörlerden yüklenir.&lt;/p&gt;                       &lt;p&gt;Güvenlik nedeniyle onaylanmış uygulama ekleri temel RetroShare çalıştırılabilir dosyası ya da uygulama eki kitaplıkları değişene kadar otomatik olarak yüklenir. Bu durumda kullanıcı uygulama eklerini yeniden onaylamalıdır. Bir uygulama ekini el ile etkinleştirmek için &quot;Etkinleştir&quot; düğmesine tıklayıp RetroShare yazılımını yeniden başlatın.&lt;/p&gt;&lt;p&gt;Kendi uygulama eklerinizi geliştirmek isterseniz, geliştirici ekibiyle görüşebilirsiniz. Size seve seve yardımcı olurlar!&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16782,27 +18251,12 @@ p, li { white-space: pre-wrap; }
         <translation>Pencere en üstte kalsın</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">Bu kişiyi engelle (Olumsuz olarak değerlendirir)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished">Kararsız olarak değerlendir</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished">Olumlu olarak değerlendir</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16836,6 +18290,22 @@ p, li { white-space: pre-wrap; }
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>The person you are talking to has deleted the secured chat tunnel.</source>
+        <translation type="vanished">Konuştuğunuz kişi güvenli sohbet tünelini silmiş.</translation>
+    </message>
+    <message>
+        <source>The chat partner deleted the secure tunnel, messages will be delivered as soon as possible</source>
+        <translation type="vanished">Sohbet eşiniz güvenli tüneli kaldırmış, iletileriniz en kısa zamanda gönderilecektir</translation>
+    </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">Bu pencereyi kapatmak görüşmenizi sona erdirerek, eşinizi bilgilendirir ve şifrelenmiş tüneli kaldırır.</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">Tünel kapatılsın mı?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16855,7 +18325,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Yeni</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">Beğendim</translation>
     </message>
@@ -16875,8 +18345,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished">Yorumlar </translation>
     </message>
@@ -16901,13 +18371,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished">Yorumlar</translation>
     </message>
@@ -16935,12 +18405,20 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">İmzalayan:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">Notlar</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
@@ -16955,22 +18433,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">Görsel Dosyası Yükle</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16986,17 +18454,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17006,7 +18464,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">İleti Gönder</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">Bir bağlantı gönderiyorsunuz. Başarılı bir gönderinin sırrı ilginç bir içerik ve açıklayıcı bir başlıktır.</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">Gönder</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Yeni bir ileti gönder</translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>Lütfen bir başlık ekleyin</translation>
     </message>
@@ -17026,22 +18500,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17056,7 +18520,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Şu olarak gönder</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17067,7 +18531,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Görsel</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17077,7 +18541,7 @@ p, li { white-space: pre-wrap; }
         <translation>Başlık</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>Bağlantı</translation>
     </message>
@@ -17085,12 +18549,44 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">Gönderilen Bağlantılar</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Gönderilen&lt;/h1&gt;        &lt;p&gt;Gönderilen hizmeti İnternet bağlantılarının forum ve kanalllar gibi RetroShare düğümleri üzerinden paylaşılmasını sağlar&lt;/p&gt; 	 &lt;p&gt;Bağlantılara abone olan kullanıcılar tarafından yorum yapılabilir. Bir değerlendirme sistemi sayesinde önemli bağlantılar vurgulanabilir.&lt;/p&gt;      &lt;p&gt;Paylaşılacak bağlantılarla ilgili bir kısıtlama yoktur. Bu nedenle bağlantıları açarken dikkatli olun.&lt;/p&gt;     &lt;p&gt;Başka şekilde ayarlamadıysanız, gönderilen bağlantılar %1 gün saklanır ve son %2 gündeki iletiler eşitlenir.&lt;/p&gt;     </translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">Başlık Ekle</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">Başlıklarım</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">Abone Olunmuş Başlıklar</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">Beğenilen Başlıklar</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">Diğer Başlıklar</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Bağlantılar</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17124,7 +18620,31 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">Gönderilen Konu</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">Konu Yöneticisi Ekle</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">Konu Yöneticilerini Seçin</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">Yeni Konu Ekle</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">Konuyu Düzenle</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">Konuyu Güncelle</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17162,17 +18682,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished">Metin Etiketi</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>Gönderilenlere Abone Ol</translation>
     </message>
@@ -17188,7 +18698,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -17203,17 +18713,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">Gönderilen Açıklaması</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">Yükleniyor</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">Gönderilen Ekle</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">Hiç</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17226,18 +18743,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">Site</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>Yorumlar </translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17248,12 +18769,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>Yorum yapın</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished">Yorumlar</translation>
     </message>
@@ -17263,7 +18784,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;Bu iletinin yazarı (%1 kodlu) engellendi.&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17273,17 +18794,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>Beğendim</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>Beğenmedim</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>Okunmuş olarak işaretle ve ögeyi sil</translation>
     </message>
@@ -17293,7 +18818,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yeni</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>Yeni Yorum:</translation>
     </message>
@@ -17303,7 +18828,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yorum Değeri</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
     </message>
@@ -17344,10 +18869,77 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>Yükleniyor</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">Gönderen</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">Form</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">Sıcak</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Yeni</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">Beğenilen</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Bügün</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">Dün</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">Bu Hafta</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">Bu Ay</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">Bu Yil</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">Yeni bir ileti gönder</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">Sonraki</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">Lütfen oylamadan önce bir imzalayan kimliği oluşturun ya da seçin</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">Önceki</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17367,17 +18959,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17387,15 +18969,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Yönetici:</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished">Dağıtım:</translation>
     </message>
@@ -17405,42 +18987,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished">Metin Etiketi</translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">İletiler</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17460,7 +19042,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Sıcak</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished">Arama</translation>
     </message>
@@ -17490,17 +19072,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17515,17 +19097,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17535,38 +19112,34 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Düzenle</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished">bilgiler</translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+18"/>
         <source>Subscribed</source>
-        <translation type="unfinished">Abone</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -17574,7 +19147,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Abone Ol</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">Hiç</translation>
     </message>
@@ -17621,7 +19194,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+32"/>
         <source>Public</source>
-        <translation type="unfinished">Herkese Açık</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
@@ -17648,16 +19221,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished">Bir Kanal Seçilmemiş</translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17666,6 +19229,14 @@ p, li { white-space: pre-wrap; }
         <source>Tabs</source>
         <translation>Sekmeler</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">Her konu yeni bir sekmede açılsın</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">Bağlantılar</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17679,6 +19250,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">Gönderilme</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17747,16 +19322,16 @@ p, li { white-space: pre-wrap; }
         <translation>Profil Yönetimi</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17868,7 +19443,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>Durum iletisini düzenle</translation>
@@ -17884,7 +19459,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Profil Yönetimi</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>Genel Bilgiler</translation>
     </message>
@@ -17919,12 +19494,12 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation>Çevrimiçi süresi:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>Diğer Bilgiler</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>Adresim</translation>
     </message>
@@ -17968,27 +19543,51 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">Şu Hesapla Gönderilsin:</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">1. Hesap</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">2. Hesap</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">3. Hesap</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>Pulse üzerine ekle</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">süzgeç</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">Adres Ekleyici</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>Şu Şekilde Görüntüle</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17998,12 +19597,12 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished">Kimden:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18033,13 +19632,13 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished">Olumsuz</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18051,22 +19650,12 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18075,13 +19664,17 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Pulse Wire Üzerine Gönder</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18096,24 +19689,34 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">Görsel Dosyası Yükle</translation>
+        <source>From</source>
+        <translation type="vanished">Kimden</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">Tarih</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18124,7 +19727,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18143,7 +19746,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18153,7 +19756,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18180,7 +19783,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18190,7 +19793,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18210,7 +19813,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18326,7 +19929,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18334,42 +19937,37 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18401,7 +19999,7 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18409,8 +20007,8 @@ Kimliği İçe Aktar düğmesine tıklayarak yükleyebilirsiniz</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>Onaylama</translation>
     </message>
@@ -18681,12 +20279,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Eş ayrıntıları</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>Dosya isteği iptal edildi</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>Bu RetroShare sürümü OpenPGP-SDK kullanır. Bu nedenle sistem paylaşımlı PGP anahtarlığını kullanamaz, ama çalışan tüm RetroShare kopyaları ile paylaşılan kendi anahtarlığı bulunur.&lt;br&gt;&lt;br&gt;Büyük olasılıkla uygulamanın yeni sürümüne henüz geçtiğiniz için, var olan RetroShare hesaplarında PGP anahtarlarının olduğu anılmasına rağmen, böyle bir anahtarlığınız yok gibi görünüyor.</translation>
     </message>
@@ -18717,7 +20315,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>Beklenmeyen bir sorun çıktı. Lütfen &apos;RsInit::InitRetroShare beklenmeyen dönüş kodu %1&apos; hatasını bildirin.</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18751,7 +20349,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>Birden çok kopya</translation>
@@ -18773,26 +20371,6 @@ Kilit dosyası:</translation>
 Kilit dosyası:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18875,7 +20453,7 @@ Bildirilen hata:
         <translation>Veri iletilen</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>DSA anahtarlarıyla ilişkili düğümleriniz var gibi görünüyor:</translation>
     </message>
@@ -18885,7 +20463,7 @@ Bildirilen hata:
         <translation>Bu RetroShare sürümü henüz DSA anahtarlarını desteklenmiyor. Tüm bu düğümler kullanılamayacak. Bunun için çok üzgünüz.</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>etkin</translation>
     </message>
@@ -18895,7 +20473,7 @@ Bildirilen hata:
         <translation>devre dışı</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>%1 IP adresini beyaz listeye taşı</translation>
     </message>
@@ -18911,7 +20489,7 @@ Bildirilen hata:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>%1 saniye önce</translation>
     </message>
@@ -18979,7 +20557,7 @@ Security: no anonymous IDs</source>
 Güvenlik: İsimsiz kodlar kullanılamaz</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation>Sohbet odasına katıl</translation>
     </message>
@@ -19007,7 +20585,7 @@ Güvenlik: İsimsiz kodlar kullanılamaz</translation>
         <translation>XML dosyası işlenemedi!</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation>Süresiz</translation>
     </message>
@@ -19187,29 +20765,13 @@ Güvenlik: İsimsiz kodlar kullanılamaz</translation>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished">Ad</translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">Düğüm</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">Durum</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19402,6 +20964,10 @@ Güvenlik: İsimsiz kodlar kullanılamaz</translation>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;Bu sertifikanın içeriği:</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19452,18 +21018,6 @@ Güvenlik: İsimsiz kodlar kullanılamaz</translation>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19626,7 +21180,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>Tüm Ağda</translation>
     </message>
@@ -19809,7 +21363,7 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>Gömülü görsellerin yüklenmesi engellenmiş.</translation>
     </message>
@@ -19822,7 +21376,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>Varsayılan olarak onaylandı</translation>
     </message>
@@ -19995,22 +21549,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">Görseli kaydet</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20018,12 +21562,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation>Ağaç Görünümü Ayarları</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20053,6 +21597,14 @@ p, li { white-space: pre-wrap; }
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">Görüntülenecek sütun...</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[başlık yok]</translation>
+    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -20715,7 +22267,7 @@ Dosyanın doğru olduğunu düşünüyorsanız bu satırı silerek dosyayı Retr
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished">Ad</translation>
@@ -20836,7 +22388,7 @@ Dosyanın doğru olduğunu düşünüyorsanız bu satırı silerek dosyayı Retr
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished">Ad</translation>
     </message>
@@ -20856,7 +22408,7 @@ Dosyanın doğru olduğunu düşünüyorsanız bu satırı silerek dosyayı Retr
         <translation type="unfinished">IP Adresi</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20915,7 +22467,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished">İleti arkadaşlarınıza iletilecek.</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... Düzeltilmiş İleti ... ]</translation>
     </message>
@@ -20929,6 +22481,11 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>[Unknown]</source>
         <translation type="unfinished">[Bilinmiyor]</translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[... İleti Eksik ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20942,11 +22499,6 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <source>From</source>
         <translation type="unfinished">Kimden</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20969,18 +22521,13 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">Okunmuş durumuna göre sıralamak için tıklayın</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">Gönderene göre sıralamak için tıklayın</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -21003,9 +22550,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21026,7 +22571,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>TÜM RetroShare ayarlarını sıfırlar.</translation>
     </message>
@@ -21087,7 +22632,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>RetroShare arayüz dilini ayarlar.</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>&apos;%1&apos;:%2 günlük dosyası açılamadı</translation>
     </message>
@@ -21108,7 +22653,11 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Veri klasörü oluşturulamadı: %1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Değişiklik</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21138,7 +22687,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>Belirtilen dil kodu geçersiz:</translation>
     </message>
@@ -21156,7 +22705,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>Kayıt Defterine Erişim Hatası. Yönetici izinleri gerekiyor olabilir.</translation>
@@ -21173,12 +22722,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>Buraya bir anahtar sözcük yazın (en az 3 karakter uzunluğunda)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>Aramayı Başlat</translation>
     </message>
@@ -21240,7 +22789,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Temizle</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>Anahtar Sözcükler</translation>
     </message>
@@ -21255,7 +22804,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Kod Arama</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>Dosya Adı</translation>
     </message>
@@ -21355,23 +22904,23 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Seçilmişleri indir</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>Dosya Adı</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>Indir</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>RetroShare Bağlantısını Kopyala</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>RetroShare Bağlantısını Gönder</translation>
     </message>
@@ -21381,7 +22930,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>İndirme Bildirimi</translation>
     </message>
@@ -21418,7 +22967,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Tümünü Kaldır</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>Klasör</translation>
@@ -21429,17 +22978,17 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>Yeni RetroShare Bağlantıları</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>Klasör Aç</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>Derleme Oluştur...</translation>
     </message>
@@ -21459,7 +23008,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Derleme dosyasından indir...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>Derleme</translation>
     </message>
@@ -21467,7 +23016,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>Eş ayrıntıları</translation>
     </message>
@@ -21483,22 +23032,22 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Ögeyi Sil</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>IP Adresi:</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>Eş Kodu:</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>Konum:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>Eş Adı:</translation>
     </message>
@@ -21515,7 +23064,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Gizle</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation>ancak bildirilen:</translation>
     </message>
@@ -21540,8 +23089,8 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>&lt;p&gt;Arkadaşınız bu IP adresine bağlanmak istiyor. IP adresini yeni değiştirdiyseniz bu uyarıyı dikkate almayın. IP adresini değiştirmediyseniz aradaki bir eş tarafından bu arkadaşınıza şüpheli bir IP adresi gönderiliyor olabilir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt; &lt;body&gt;&lt;p&gt;Bu uyarı sizi trafik iletme saldırılarına karşı korumayı amaçlıyor. Böyle bir durumda, bağlı olduğunuz arkadaşınız dış IP adresiniz yerine saldırganın IP adresini görür. &lt;/p&gt; &lt;p&gt;&lt;br/&gt;&lt;/p&gt; &lt;p&gt;Bununla birlikte, bir nedenle IP adreslerini değiştirdiyseniz (Bazı hizmet sağlayıcılar düzenli olarak IP adreslerini değiştirir), bu uyarı size yalnızca RetroShare farketmeden önce bir arkadaşınıza yeni bir IP adresi ile bağlandığınızı belirtir. Bu durumda bir sorun yoktur.&lt;/p&gt; &lt;p&gt;&lt;br/&gt;&lt;/p&gt; &lt;p&gt;Kendi IP adreslerinizi beyaz listeye ekleyerek (örneğin, hizmet sağlayıcınızın IP adresi aralığını) hatalı uyarıları gizleyebilir ya da Ayarlar-&amp;gt;Bildirim-&amp;gt;Haber Akışı bölümünden tamamen devre dışı bırakabilirsiniz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -21549,7 +23098,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>RetroShare üzerinde arkadaşınız olmak istiyor</translation>
     </message>
@@ -21580,7 +23129,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>Genişlet</translation>
     </message>
@@ -21625,12 +23174,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Durum:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>İleti Yaz</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>Bağlantı Girişimi</translation>
     </message>
@@ -21650,22 +23199,17 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Bilinmeyen (Giden) Bağlantı İsteği</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>Bilinmeyen Güvenlik Sorunu</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21675,7 +23219,11 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">Bilinmeyen Eş</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>Gizle</translation>
     </message>
@@ -21685,7 +23233,7 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Bu Arkadaşı silmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>Sertifika imzası yanlış!! Bu eş, olduğunu iddia ettiği kişi değil.</translation>
     </message>
@@ -21695,12 +23243,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Eksik/Bozuk sertifika. Kullanıcı gerçek bir RetroShare kullanıcısı değil.</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>Sertifika içeride bir soruna yol açtı.</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>Eş/Düğüm arkadaş listesinde değil (PGP kodu=</translation>
     </message>
@@ -21759,12 +23307,12 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>Yerel Adres</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21785,22 +23333,22 @@ arkadaşlarınız da olumlu olarak değerlendirmemiş:
         <translation>Kapı:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>Yerel ağ</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>Dış IP adres bulucu</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>Bilinen / Önceki IP Adresleri:</translation>
     </message>
@@ -21817,16 +23365,21 @@ Ayrıca güvenlik duvarı ya da VPN bağlantısı kullanıyorsanız da
 yardımcı olur.</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>RetroShare IP adresinizi şu sitelere sorabilsin:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>Kullanılabilecek kapı numaraları 10 ile 65535 arasındadır. Normal olarak 1024 altındaki kapı numaraları sistem kullanımına ayrılmıştır.</translation>
     </message>
@@ -21836,46 +23389,23 @@ yardımcı olur.</translation>
         <translation>Kullanılabilecek kapı numaraları 10 ile 65535 arasındadır. Normal olarak 1024 altındaki kapı numaraları sistem kullanımına ayrılmıştır.</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>Onion Adresi</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>Keşif Açık (Önerilir)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>Keşif Kapalı</translation>
     </message>
@@ -21885,7 +23415,7 @@ List of found external IP:
         <translation>Gizli - Yapılandırmaya Bakın</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>I2P Adresi</translation>
     </message>
@@ -21910,95 +23440,37 @@ List of found external IP:
         <translation>geliş tamam</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>Vekil sunucu çalışıyor görünüyor.</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P vekil sunucusu etkinleştirilmemiş</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22013,7 +23485,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22023,7 +23559,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>Gizli bir hizmet üzerinden ulaşılabiliyorsunuz.</translation>
     </message>
@@ -22037,12 +23588,12 @@ Tüm hizmetler düzgün çalışıyor mu??
 Ayrıca kapı ayarlarınızı da denetleyin!</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[Gizli Kip]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu işlem bilinen adresler listesini temizler. Böylece adres listenizde olabilecek herhangi bir nedenle geçersiz/ilgisiz/süresi geçmiş adreslerin kişi adresi olarak arkadaşlarınıza bildirilmesi engellenir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22052,7 +23603,7 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation>Temizle</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>İndirme sınırı (KB/s) </translation>
     </message>
@@ -22067,23 +23618,23 @@ Ayrıca kapı ayarlarınızı da denetleyin!</translation>
         <translation>Yükleme sınırı (KB/s) </translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Yükleme sınırı tüm uygulamayı kapsar. Yükleme sınırı çok küçük olursa düşük öncelikli hizmetler engellenebilir (forumlar, kanallar). Önerilen en küçük değer: 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22094,7 +23645,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22104,7 +23665,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22114,7 +23680,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22154,7 +23730,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished">Başlat</translation>
     </message>
@@ -22169,7 +23745,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">Durdur</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">Gelen</translation>
     </message>
@@ -22205,32 +23786,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished">Aktarıcı</translation>
     </message>
@@ -22285,7 +23841,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">Toplam:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22310,7 +23866,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22322,7 +23878,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>IP Süzgeçleri</translation>
     </message>
@@ -22345,7 +23901,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>Durum</translation>
     </message>
@@ -22405,28 +23961,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Beyaz listeye ekle</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>Gizli Hizmet Yapılandırması</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tor Socks vekil sunucusunun kapı numarası. RetroShare düğümünüz bu kapıyı kullanarak&lt;/p&gt;&lt;p&gt;Gizli düğümlere bağlanabilir. Bilgisayarınızda bu kapı etkinleştiğinde sağdaki LED yeşile döner. &lt;/p&gt;&lt;p&gt;Bununla birlikte bu durum RetroShare trafiğinizin Tor üzerinden aktığı anlamına gelmez. Tor üzerinden veri akışı yalnız &lt;/p&gt;&lt;p&gt;Gizli düğümlere bağlandığınızda ya da Gizli bir düğüm çalıştırıyorsanız gerçekleşir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bilgisayarınızda soldaki kapı dinlemesi etkinleştiğinde bu LED yeşile döner. &lt;/p&gt;&lt;p&gt;Bununla birlikte bu durum RetroShare trafiğinizin Tor üzerinden aktığı anlamına gelmez. Tor üzerinden veri akışı yalnız &lt;/p&gt;&lt;p&gt;Gizli düğümlere bağlandığınızda ya da Gizli bir düğüm çalıştırıyorsanız gerçekleşir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22442,18 +23987,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bilgisayarınızda soldaki kapı dinlemesi etkinleştiğinde bu LED yeşile döner. &lt;/p&gt;&lt;p&gt;Bununla birlikte bu durum RetroShare trafiğinizin I2P üzerinden aktığı anlamına gelmez. I2P üzerinden veri akışı yalnız &lt;/p&gt;&lt;p&gt;Gizli düğümlere bağlandığınızda ya da Gizli bir düğüm çalıştırıyorsanız gerçekleşir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P gidiş tamam</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>Hizmet Adresi</translation>
     </message>
@@ -22488,12 +24033,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Lütfen bir hizmet adresi yazın</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>IP Aralığı</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>DHT tarafından IP maskelemesi için bildirildi</translation>
     </message>
@@ -22516,22 +24061,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Sizin eklediğiniz</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Beyaz listeye IP adresleri şu kaynaklardan toplanır: El ile değiş tokuş edilmiş bir sertifika ile gelen IP adresleri, bu bölümden el ile yazılan ya da güvenlik akışı ögelerinden alınan IP adresi aralıkları.&lt;/p&gt;&lt;p&gt;RetroShare varsayılan olarak (1) IP adresi beyaz listede bulunan eşlerle bağlantıya kara listede bulunsalar bile her zaman izin verir; (2) isteğe bağlı olarak IP adreslerinin beyaz listede bulunması gerekir. Bu davranış her bir eş için RetroShare düğümlerinin &amp;quot;Ayrıntılar&amp;quot; penceresinden değiştirilebilir. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT, Bittorrent DHT özelliğini kullanan arkadaşlarınızdan gelen bağlantı isteklerini yanıtlamanızı sağlayarak bağlanabilirliği büyük ölçüde arttırır. DHT üzerinde herhangi bir veri saklanmaz. Yalnızca diğer RetroShrare düğümleri ile iletişim kurmak için bir vekil sistem olarak kullanılır.&lt;/p&gt;&lt;p&gt;Keşif hizmeti, güvendiğiniz kişilerin düğüm adı ve kodunu bağlı olduğunuz eşlere ileterek yeni arkadaşlar edinmelerine yardımcı olur. Asla otomatik olarak arkadaşlık kurulmaz. İki eşin bağlanabilmesi için birbirlerine karşılıklı olarak güvenmeleri gerekir. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu işlem etkinleştirildiğinde, aşağıdaki web sitelerinden kendi IP adresinizi aldığınızda RetroShare bu imi yeşile döndürür. RetroShare kendi IP adresinizi bulmak için başka yöntemler de kullanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu liste çeşitli kaynaklardan toplanan bilgiler ile otomatik olarak doldurulur: DHT tarafından bildirilen maskelenmiş eşler, sizin yazdığınız IP aralıkları ve arkadaşlarınız tarafından bildirilen IP aralıkları. Varsayılan ayarlar sizi büyük ölçekli trafik aktarımlarına karşı korur.&lt;/p&gt;&lt;p&gt;Maskelenmiş IP adreslerinin otomatik olarak öngörülmesi yüzünden arkadaşlarınızın IP adresleri kara listeye eklenebilir. Bu durumda bu IP adreslerini beyaz listeye eklemek için sağ tıklayın.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22566,7 +24111,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Şuradan başlayan DHT maskeleme IP adresleri otomatik engellensin</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22576,12 +24121,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks Vekil Sunucusu</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor gidiş tamam</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor vekil sunucusu etkinleştirilmemiş</translation>
     </message>
@@ -22661,7 +24206,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>özel yayın anahtarınızı paylaşacağınız eşleri seçin</translation>
     </message>
@@ -22671,12 +24216,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Arkadaşla Paylaş</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>Paylaş</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>Kanalınızı paylaşarak arkadaşlarınıza bildirebilirsiniz.
@@ -22696,7 +24241,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Paylaşılan Klasör Yönetimi</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation>Paylaşılan klasör</translation>
     </message>
@@ -22716,17 +24261,17 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Görünürlük</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation>Yeni ekle</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>Paylaşım Klasörü Ekle</translation>
     </message>
@@ -22736,7 +24281,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>Uygula ve kapat</translation>
     </message>
@@ -22827,7 +24372,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Klasör bulunamadı ya da klasör adı kabul edilmiyor.</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>Paylaşılan klasörlerin listesi. Alttaki düğmeleri kullanarak klasörler ekleyip çıkarabilirsiniz. Yeni bir klasörü ilk kez eklediğinizde, bu klasördeki tüm dosyalar paylaşılır. Ardından paylaşılan her klasör için ayrı ayrı paylaşım işaretlerini ayarlayabilirsiniz.</translation>
     </message>
@@ -22835,7 +24380,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>Dosyalar</translation>
     </message>
@@ -22886,16 +24431,11 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>dosyaları seçin</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>Seçilmişleri indir</translation>
     </message>
@@ -22905,7 +24445,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>İndir</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>RetroShare Bağlantılarını Panoya Kopyala</translation>
     </message>
@@ -22920,7 +24460,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>RetroShare Bağlantılarını Gönder</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation>Bazı dosyalar yok sayıldı</translation>
     </message>
@@ -22936,7 +24476,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Öneriler</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>Derleme Ekle...</translation>
     </message>
@@ -22961,7 +24501,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Derleme dosyasından indir...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23104,12 +24644,12 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>Yapılandırmayı yükle</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>Arayüz ekle</translation>
     </message>
@@ -23133,7 +24673,7 @@ Kanalınızı paylaşmak istediğiniz Arkadaşlarınızı seçin.</translation>
         <translation>Parolam Hatırlansın</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>Oturum Aç</translation>
     </message>
@@ -23486,7 +25026,7 @@ Bu seçim ayarlardan değiştirilebilir.</translation>
         <translation>Durum iletisi</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>İleti:</translation>
     </message>
@@ -23731,7 +25271,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>Tüm Etiketleri Kaldır</translation>
     </message>
@@ -23767,15 +25307,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation>Bilinmiyor</translation>
     </message>
@@ -23785,13 +25322,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23801,57 +25343,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">Hata</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">Bağlı değil</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23859,7 +25356,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23869,7 +25366,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23880,12 +25377,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23913,7 +25409,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>Aktarım Ayarları</translation>
@@ -23924,7 +25420,7 @@ p, li { white-space: pre-wrap; }
         <translation>Aynı anda en çok indirme sayısı:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation>Paylaşılan Klasörler</translation>
     </message>
@@ -23934,27 +25430,22 @@ p, li { white-space: pre-wrap; }
         <translation>Gelen klasörü otomatik olarak paylaşılsın (Önerilir)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation>Paylaşımı Düzenle</translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished">Paylaşılan klasörleri yapılandır</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation>Paylaşılan klasörler şu aralıkla denetlensin</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation>dakika</translation>
     </message>
@@ -24039,7 +25530,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24048,12 +25539,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24078,12 +25564,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>Akış</translation>
     </message>
@@ -24142,13 +25623,38 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; arkadaşlar arasında yapılmasına gerek olmayan veri ve arama isteklerini aktarımlarını eşler arasında yapabilir. Bu trafikte yalnız bağlantılı arkadaş listesi bulunur ve isimsizdir.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;Paylaşılan her bir klasör için paylaşım işaretleri paylaşılan dosyalar penceresinden ayarlanabilir :&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Arkadaşlar gözatabilir&lt;/span&gt;: Bu dosyaları yalnız arkadaşlarınız görebilir.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;İsimsiz olarak paylaşılan&lt;/span&gt;: Bu dosyalara uzak F2F tünelleri üzerinden isimsiz olarak erişilebilir.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>Saniyede iletilecek en fazla tünel isteği sayısı:</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Akış &lt;/span&gt;artan sırada, önizlemeye izin verecek şekilde 1MB boyutlu dosya parçaları aktarımının istenmesine neden olur. &lt;span style=&quot; font-weight:600;&quot;&gt;Rastgele&lt;/span&gt; Tümüyle rastgeledir ve kaynaşmaya yönelik davranır. &lt;span style=&quot; font-weight:600;&quot;&gt;Gelişen&lt;/span&gt; Ortalama çözüm. dosya parçasının sonundaki 50MB bölümden rastgele seçilir. Böylece büyük boş dosya hazırlama süresini beklemeden biraz rastlantısallık sağlanır.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Boş disk alanı bu sınırın altına inerse RetroShare tüm aktarımları ve yapılandırma dosyası kayıtlarını durdurur. Böylece bazı sistemlerde oluşabilecek veri kayıpları engellenir. Gerçekleşirse bu durum açılan bir pencere ile bildirilir.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24158,17 +25664,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Bu değer saniyede iletilebilecek tünel isteği sayısını belirler. &lt;/p&gt;&lt;p&gt;İnternet bağlantı hızınız yüksek ise, durağan olarak daha uzun tünellerin geçişine izin vermek için bu değeri 30-40 yapabilirsiniz. Bu işlem çok sayıda küçük paket oluşturarak kendi dosya aktarımınızı yavaşlatabileceğinden çok dikkatli olun. &lt;/p&gt;&lt;p&gt;Varsayılan değer: 20. Emin değilseniz böyle bırakın.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">Uyarı</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation>Gelen Klasörünü Ayarla</translation>
     </message>
@@ -24196,7 +25692,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>İndirme tamamlandı</translation>
     </message>
@@ -24220,23 +25716,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">%1 dosya indirildi</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">%1 dosya indirildi</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 dosya indirildi</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 dosya indirildi</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>İndirmeler</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>Yüklemeler</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>Ad</translation>
@@ -24443,7 +25955,11 @@ p, li { white-space: pre-wrap; }
         <translation>Belirtin...</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
+        <translation type="vanished"> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Dosya Aktarımı&lt;/h1&gt;                                                             &lt;p&gt;RetroShare iki şekilde dosya aktarımı sunar: Arkadaşlarınızdan doğrudan aktarım ve uzak isimsiz tünel aktarımı. Ek olarak, dosya aktarımı birden çok kaynak kullanabilir ve karşılıklıdır (indirme yapılırken yükleme de yapılır)&lt;/p&gt;                                         &lt;p&gt;Sol yan çubuktaki &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; simgesini kullanarak dosyaları paylaşabilirsiniz.     Paylaşılan dosyalar Dosyalarım sekmesi altında görüntülenir. Her bir arkadaş grubunuzun bu dosyaları kendi Arkadaşların Dosyaları sekmelerinde görüp görümeyeceğini seçebilirsiniz.&lt;/p&gt;    &lt;p&gt;Arama sekmesi arkadaşlarınızın dosya listelerinde arama yapar ve birden çok sıçramalı tünel sistemi üzerinden uzak dosyalara isimsiz olarak erişebilir.&lt;/p&gt;     </translation>
+    </message>
+    <message>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>Kuyrukta Taşı...</translation>
     </message>
@@ -24468,7 +25984,7 @@ p, li { white-space: pre-wrap; }
         <translation>Klasör seçin</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>İsimsiz uçtan uca şifrelenmiş tünel 0x</translation>
     </message>
@@ -24489,7 +26005,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24522,17 +26038,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 dosyası tamamlanmamış. Bu bir ortam dosyası ise önizlemeyi deneyin.</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">Uyarı</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>Dosya adını değiştir</translation>
     </message>
@@ -24547,7 +26053,7 @@ p, li { white-space: pre-wrap; }
         <translation>Lütfen yeni -ve geçerli- bir dosya adı yazın</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>Tümünü genişlet</translation>
@@ -24674,18 +26180,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>Sütunlar</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>Dosya Aktarımları</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>Yol</translation>
     </message>
@@ -24695,7 +26206,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yol Sütunu Görüntülensin</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>Önizleme dosyası silinemedi</translation>
     </message>
@@ -24705,7 +26216,7 @@ p, li { white-space: pre-wrap; }
         <translation>Yeniden denensin mi?</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>Derleme Ekle...</translation>
     </message>
@@ -24720,12 +26231,7 @@ p, li { white-space: pre-wrap; }
         <translation>Derlemeyi Görüntüle...</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+193"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>Derleme</translation>
     </message>
@@ -24735,7 +26241,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>İsimsiz tünel 0x</translation>
     </message>
@@ -24956,6 +26462,10 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">İsimsiz tüneller</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25149,17 +26659,12 @@ p, li { white-space: pre-wrap; }
         <translation>Form</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>RetroShare Web arayüzü kullanılsın</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">Durum:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>Web parametreleri</translation>
     </message>
@@ -25199,27 +26704,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Web Arayüzü&lt;/h1&gt;       &lt;p&gt;Web arayüzü ile RetroShare web tarayıcı üzerinden kullanılabilir. Birden çok aygıt bir RetroShare kopyası üzerinden denetlenebilir. Böylece bir tablet üzerinden başlattığınız sohbeti masaüstü bilgisayar üzerinden sürdürebilirsiniz.&lt;/p&gt;     &lt;p&gt;Uyarı: Erişim denetimi ve şifreleme olmadığından, web arayüzünü İnternet üzerine açmayın. Web arayüzünü İnternet üzerinden kullanmak istiyorsanız bağlantı güvenliğini sağlamak için bir SSH tüneli ya da vekil sunucusu kullanın.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>Web arayüzü etkinleştirilmemiş</translation>
     </message>
@@ -25229,12 +26724,12 @@ p, li { white-space: pre-wrap; }
         <translation>Web arayüzü etkinleştirilmemiş. Ayarlar &gt; Web arayüzü bölümünden etkinleştirebilirsiniz.</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>Web arayüzü başlatılamadı</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>Web arayüzü</translation>
     </message>
@@ -25371,7 +26866,11 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki Sayfaları</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">Yeni Grup</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>Sayfa Adı</translation>
     </message>
@@ -25386,7 +26885,7 @@ p, li { white-space: pre-wrap; }
         <translation>Kaynak Kodu</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25474,7 +26973,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>Sayfa Düzenleme Geçmişi</translation>
     </message>
@@ -25509,7 +27008,7 @@ p, li { white-space: pre-wrap; }
         <translation>SayfaKodu</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25539,18 +27038,14 @@ p, li { white-space: pre-wrap; }
         <translation>Etiketler</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">Geçmiş</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>Düzenleme Geçmişi Görüntülensin</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>Durum</translation>
     </message>
@@ -25571,7 +27066,7 @@ p, li { white-space: pre-wrap; }
         <translation>Geri Al</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>Gönder</translation>
     </message>
@@ -25643,6 +27138,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">ZamanAralığı</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25654,7 +27153,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">Yenile</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25669,7 +27177,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Diğerleri</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25689,7 +27197,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25719,17 +27227,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">Geçen Ay</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">Geçen Hafta</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">Bugün</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">Yeni</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">başlangıç</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">bitiş</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">Arama/Süzgeç</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">Tüm Ağda</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">Hesap Yönetimi</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">Görüntülenen:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>Benimkiler</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">Arkadaşlar</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>İzlenen</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">Özel</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">1. Hesap</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">2. Hesap</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">3. Hesap</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">İşaret Kutusu</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">Wire Üzerine Pulse Gönderin</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25792,42 +27368,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Form</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">Konum:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25872,41 +27441,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">Kullanılamıyor</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">İzlenen</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>Bilinmeyen</translation>
@@ -25984,7 +27523,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1y %2g</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26017,11 +27556,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">Görseller (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_zh_CN.ts b/retroshare-gui/src/lang/retroshare_zh_CN.ts
index 82bafc9e1..a07132cf4 100644
--- a/retroshare-gui/src/lang/retroshare_zh_CN.ts
+++ b/retroshare-gui/src/lang/retroshare_zh_CN.ts
@@ -84,6 +84,13 @@
         <translation>仅隐藏节点</translation>
     </message>
 </context>
+<context>
+    <name>AddCommentDialog</name>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">添加评论</translation>
+    </message>
+</context>
 <context>
     <name>AddFileAssociationDialog</name>
     <message>
@@ -122,12 +129,12 @@
         <translation>RetroShare: 高级搜索</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation>搜索条件</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation>追加搜索条件。</translation>
     </message>
@@ -137,7 +144,7 @@
         <translation>重置搜索条件。</translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation>取消搜索。</translation>
     </message>
@@ -157,6 +164,177 @@
         <translation>搜索 </translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Create Album</source>
+        <translation type="vanished">创建相册</translation>
+    </message>
+    <message>
+        <source>Album Name:</source>
+        <translation type="vanished">相册名称:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="vanished">类别:</translation>
+    </message>
+    <message>
+        <source>Animals</source>
+        <translation type="vanished">动物</translation>
+    </message>
+    <message>
+        <source>Family</source>
+        <translation type="vanished">家人</translation>
+    </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">好友</translation>
+    </message>
+    <message>
+        <source>Flowers</source>
+        <translation type="vanished">花</translation>
+    </message>
+    <message>
+        <source>Holiday</source>
+        <translation type="vanished">假日</translation>
+    </message>
+    <message>
+        <source>Landscapes</source>
+        <translation type="vanished">风景</translation>
+    </message>
+    <message>
+        <source>Pets</source>
+        <translation type="vanished">宠物</translation>
+    </message>
+    <message>
+        <source>Portraits</source>
+        <translation type="vanished">人像</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="vanished">旅行</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="vanished">工作</translation>
+    </message>
+    <message>
+        <source>Random</source>
+        <translation type="vanished">随机</translation>
+    </message>
+    <message>
+        <source>Caption:</source>
+        <translation type="vanished">标题:</translation>
+    </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">地点:</translation>
+    </message>
+    <message>
+        <source>Photographer:</source>
+        <translation type="vanished">拍照人:</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">描述:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">共享设置</translation>
+    </message>
+    <message>
+        <source>Policy:</source>
+        <translation type="vanished">策略：</translation>
+    </message>
+    <message>
+        <source>Quality:</source>
+        <translation type="vanished">质量:</translation>
+    </message>
+    <message>
+        <source>Comments:</source>
+        <translation type="vanished">评论:</translation>
+    </message>
+    <message>
+        <source>Identity:</source>
+        <translation type="vanished">标识:</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">公开</translation>
+    </message>
+    <message>
+        <source>Restricted</source>
+        <translation type="vanished">受限</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 1Mb)</source>
+        <translation type="vanished">调整大小 图像 (&lt; 1Mb)</translation>
+    </message>
+    <message>
+        <source>Resize Images (&lt; 10Mb)</source>
+        <translation type="vanished">调整大小 图像 (&lt; 10Mb)</translation>
+    </message>
+    <message>
+        <source>Send Original Images</source>
+        <translation type="vanished">发送原图</translation>
+    </message>
+    <message>
+        <source>No Comments Allowed</source>
+        <translation type="vanished">禁止评论</translation>
+    </message>
+    <message>
+        <source>Authenticated Comments</source>
+        <translation type="vanished">署名评论</translation>
+    </message>
+    <message>
+        <source>Any Comments Allowed</source>
+        <translation type="vanished">允许任何评论</translation>
+    </message>
+    <message>
+        <source>Publish with Identity</source>
+        <translation type="vanished">使用身份发布</translation>
+    </message>
+    <message>
+        <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; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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; 拖 &amp;amp;放插入图片。 点击一张图片，在下面编辑详情。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="vanished">返回</translation>
+    </message>
+    <message>
+        <source>Add Photos</source>
+        <translation type="vanished">添加照片</translation>
+    </message>
+    <message>
+        <source>Publish Album</source>
+        <translation type="vanished">发布相册</translation>
+    </message>
+    <message>
+        <source>Untitle Album</source>
+        <translation type="vanished">未命名相册</translation>
+    </message>
+    <message>
+        <source>Say something about this album...</source>
+        <translation type="vanished">写点什么吧…</translation>
+    </message>
+    <message>
+        <source>Where were these taken?</source>
+        <translation type="vanished">这些是在哪里拍摄的?</translation>
+    </message>
+    <message>
+        <source>Load Album Thumbnail</source>
+        <translation type="vanished">加载相册缩略图</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -165,11 +343,19 @@
         <source>Album</source>
         <translation>相册</translation>
     </message>
+    <message>
+        <source>Album Thumbnail</source>
+        <translation type="vanished">相册缩略图</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>TextLabel</source>
         <translation>文字标签</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">概述</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Album Title:</source>
@@ -185,6 +371,34 @@
         <source>Caption</source>
         <translation>标题</translation>
     </message>
+    <message>
+        <source>Where:</source>
+        <translation type="vanished">地点:</translation>
+    </message>
+    <message>
+        <source>When</source>
+        <translation type="vanished">何时</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">描述:</translation>
+    </message>
+    <message>
+        <source>Share Options</source>
+        <translation type="vanished">分享选项</translation>
+    </message>
+    <message>
+        <source>Comments</source>
+        <translation type="vanished">评论</translation>
+    </message>
+    <message>
+        <source>Publish Identity</source>
+        <translation type="vanished">发布身份</translation>
+    </message>
+    <message>
+        <source>Visibility</source>
+        <translation type="vanished">可见性</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -553,7 +767,7 @@ p, li { white-space: pre-wrap; }
         <translation>Retroshare </translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation> 注意: 这里提供的服务都处于试验阶段。欢迎测试。
@@ -569,6 +783,14 @@ p, li { white-space: pre-wrap; }
         <source>Circles</source>
         <translation>圈子</translation>
     </message>
+    <message>
+        <source>GxsForums</source>
+        <translation type="vanished">Gxs论坛</translation>
+    </message>
+    <message>
+        <source>GxsChannels</source>
+        <translation type="vanished">Gxs频道</translation>
+    </message>
     <message>
         <location line="+27"/>
         <source>The Wire</source>
@@ -580,23 +802,10 @@ p, li { white-space: pre-wrap; }
         <translation>照片</translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished">保存图像</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation>%p Kb</translation>
     </message>
@@ -633,13 +842,17 @@ p, li { white-space: pre-wrap; }
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Avatar</source>
+        <translation type="vanished">添加头像</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Remove</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation>设置头像</translation>
     </message>
@@ -658,6 +871,10 @@ p, li { white-space: pre-wrap; }
         <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Load Avatar</source>
+        <translation type="vanished">载入头像</translation>
+    </message>
 </context>
 <context>
     <name>AvatarWidget</name>
@@ -726,10 +943,22 @@ p, li { white-space: pre-wrap; }
         <translation>重置</translation>
     </message>
     <message>
-        <location line="+264"/>
+        <source>Receive Rate</source>
+        <translation type="vanished">接收速度</translation>
+    </message>
+    <message>
+        <source>Send Rate</source>
+        <translation type="vanished">发送速度</translation>
+    </message>
+    <message>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation>置顶</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">样式</translation>
+    </message>
     <message>
         <location line="-122"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
@@ -745,11 +974,23 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation>% 不透明</translation>
     </message>
+    <message>
+        <source>Save</source>
+        <translation type="vanished">保存</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">取消 </translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
         <translation>自从:</translation>
     </message>
+    <message>
+        <source>Hide Settings</source>
+        <translation type="vanished">隐藏设置</translation>
+    </message>
 </context>
 <context>
     <name>BandwidthStatsWidget</name>
@@ -822,7 +1063,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -852,12 +1093,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;此消息的作者(ID为%1)被禁止。&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -865,7 +1106,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished">赞</translation>
     </message>
@@ -885,7 +1126,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -923,7 +1164,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished">赞</translation>
     </message>
@@ -943,7 +1184,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,7 +1214,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">分享</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished">切换消息阅读状态</translation>
     </message>
@@ -983,7 +1224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -991,12 +1232,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">赞</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -1016,18 +1257,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">展开</translation>
     </message>
@@ -1042,12 +1283,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,17 +1457,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation>频道</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation>标签</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation>常规</translation>
     </message>
@@ -1236,17 +1477,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished">下载</translation>
+        <source>Load posts in background (Thread)</source>
+        <translation type="vanished">在新标签页打开 (Thread)</translation>
     </message>
     <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation>在新标签中打开所有频道</translation>
     </message>
@@ -1254,7 +1489,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,7 +1512,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished">赞</translation>
     </message>
@@ -1302,18 +1537,18 @@ into the image, so as to
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">展开</translation>
     </message>
@@ -1328,7 +1563,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1338,7 +1573,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">隐藏</translation>
     </message>
@@ -1346,7 +1591,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
@@ -1537,7 +1782,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation>显示聊天室</translation>
     </message>
@@ -1549,6 +1794,22 @@ into the image, so as to
         <source>Chats</source>
         <translation>聊天室</translation>
     </message>
+    <message>
+        <source>You have %1 new messages</source>
+        <translation type="vanished">您有 %1 个新消息</translation>
+    </message>
+    <message>
+        <source>You have %1 new message</source>
+        <translation type="vanished">您有 %1 个新消息</translation>
+    </message>
+    <message>
+        <source>%1 new messages</source>
+        <translation type="vanished">%1 个新消息</translation>
+    </message>
+    <message>
+        <source>%1 new message</source>
+        <translation type="vanished">%1 个新消息</translation>
+    </message>
     <message>
         <location line="+97"/>
         <source>You have %1 mentions</source>
@@ -1570,14 +1831,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation>未知聊天室</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation>删除全部</translation>
     </message>
@@ -1585,13 +1845,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation>数量</translation>
     </message>
@@ -1601,7 +1861,33 @@ into the image, so as to
         <translation>主题</translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation>订阅的私有聊天室</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation>订阅的公共聊天室</translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation>私密聊天室</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation>公共聊天室</translation>
+    </message>
+    <message>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;聊天室&lt;/h1&gt; 	 &lt;p&gt;聊天室差不多与IRC用法相同， 	 方便你与为数众多的人聊天而不需要互加好友，&lt;/p&gt; 	 &lt;p&gt;聊天室可以公开(你的好友看到)或私人(你的好友看不到它，除非你邀请他们 &lt;img src=&quot;:/images/add_24x24.png&quot; width=%2/&gt;). 	 一旦你被邀请到私人房间，你将能够在您的好友使用时 	 看到它.&lt;/p&gt; 	 &lt;p&gt;左侧列表显示 	 你好友正参与的聊天大厅 	 	 &lt;ul&gt; 			 &lt;li&gt;你也可以右键创建新的房间&lt;/li&gt; 		 &lt;li&gt;双击进入，聊天，并介绍给你的好友&lt;/li&gt; 	 &lt;/ul&gt; 	聊天室基于时钟的， 为了聊天室更好的工作，请检查你的系统时间!	 &lt;/p&gt; 	</translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation>创建聊天室</translation>
     </message>
@@ -1611,7 +1897,7 @@ into the image, so as to
         <translation>离开此房间</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation>创建一个匿名身份并进入此房间</translation>
     </message>
@@ -1670,12 +1956,12 @@ Double click a chat room to enter and chat.</source>
 双击房间可以进入聊天 </translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation>%1 邀请你进入房间%2</translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation>为此聊天室选择一个非匿名身份:</translation>
     </message>
@@ -1685,31 +1971,31 @@ Double click a chat room to enter and chat.</source>
         <translation>对这个聊天室选择一个身份：</translation>
     </message>
     <message>
-        <location line="-821"/>
+        <source>Create chat lobby</source>
+        <translation type="vanished">新建聊天室</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation>[主题未设置]</translation>
     </message>
     <message>
-        <location line="-226"/>
-        <location line="+756"/>
+        <source>Selected lobby info</source>
+        <translation type="vanished">所选聊天室信息</translation>
+    </message>
+    <message>
+        <location line="+530"/>
         <source>Private</source>
         <translation>私人</translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation>公开</translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation>匿名 ID已接受</translation>
     </message>
@@ -1719,25 +2005,42 @@ Double click a chat room to enter and chat.</source>
         <translation>取消自动订阅</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation>启用自动订阅</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation>搜索聊天室</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation>搜索名称</translation>
     </message>
     <message>
-        <location line="+162"/>
+        <source>Subscribed</source>
+        <translation type="vanished">已订阅</translation>
+    </message>
+    <message>
+        <location line="+165"/>
         <source>Columns</source>
         <translation>列</translation>
     </message>
+    <message>
+        <source>Yes</source>
+        <translation type="vanished">是</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="vanished">否</translation>
+    </message>
     <message>
         <location filename="../gui/ChatLobbyWidget.ui" line="-80"/>
         <source>Chat rooms</source>
@@ -1749,47 +2052,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation>聊天室名称：</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation>聊天室 ID ：</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation>话题:</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>类型:</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation>安全</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation>节点:</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation>文本标签</translation>
     </message>
@@ -1804,24 +2107,13 @@ Double click a chat room to enter and chat.</source>
         <translation>没有匿名 ID</translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-538"/>
+        <location line="-3"/>
         <location line="+3"/>
         <source>column</source>
         <translation>列</translation>
@@ -1835,7 +2127,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>删除项目</translation>
     </message>
@@ -1880,22 +2172,46 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation>常规</translation>
     </message>
+    <message>
+        <source>Distant Chat</source>
+        <translation type="vanished">私聊</translation>
+    </message>
     <message>
         <location line="-473"/>
         <source>Everyone</source>
         <translation>所有人</translation>
     </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="vanished">联系人</translation>
+    </message>
     <message>
         <location line="+10"/>
         <source>Nobody</source>
         <translation>无人</translation>
     </message>
     <message>
-        <location line="-401"/>
+        <source>Accept encrypted distant chat from</source>
+        <translation type="vanished">接受加密的远程聊天从</translation>
+    </message>
+    <message>
+        <source>Chat Settings</source>
+        <translation type="vanished">聊天设置</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Private Chat</source>
+        <translation type="vanished">私聊中启用表情图标</translation>
+    </message>
+    <message>
+        <source>Enable Emoticons Group Chat</source>
+        <translation type="vanished">群聊中启用表情图标</translation>
+    </message>
+    <message>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation>启用自定义字体</translation>
     </message>
@@ -1904,6 +2220,10 @@ Double click a chat room to enter and chat.</source>
         <source>Enable custom font size</source>
         <translation>启用自定义字号</translation>
     </message>
+    <message>
+        <source>Minimum font size</source>
+        <translation type="vanished">最小字体</translation>
+    </message>
     <message>
         <location line="-10"/>
         <source>Enable bold</source>
@@ -1915,7 +2235,7 @@ Double click a chat room to enter and chat.</source>
         <translation>启用斜体</translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1940,7 +2260,11 @@ Double click a chat room to enter and chat.</source>
         <translation>加载内嵌图像</translation>
     </message>
     <message>
-        <location line="+459"/>
+        <source>Chat Lobby</source>
+        <translation type="vanished">聊天室</translation>
+    </message>
+    <message>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation>闪烁标签图标</translation>
     </message>
@@ -1949,6 +2273,10 @@ Double click a chat room to enter and chat.</source>
         <source>Do not send typing notifications</source>
         <translation>不要显示输入提示</translation>
     </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="vanished">私聊</translation>
+    </message>
     <message>
         <location line="+206"/>
         <source>Open Window for new chat</source>
@@ -1970,7 +2298,11 @@ Double click a chat room to enter and chat.</source>
         <translation>闪烁窗口/标签图标</translation>
     </message>
     <message>
-        <location line="-476"/>
+        <source>Chat Font</source>
+        <translation type="vanished">聊天字体</translation>
+    </message>
+    <message>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation>更改聊天字体</translation>
     </message>
@@ -1980,10 +2312,14 @@ Double click a chat room to enter and chat.</source>
         <translation>聊天字体：</translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation>历史</translation>
     </message>
+    <message>
+        <source>Style</source>
+        <translation type="vanished">样式</translation>
+    </message>
     <message>
         <location line="-334"/>
         <location line="+198"/>
@@ -1998,13 +2334,17 @@ Double click a chat room to enter and chat.</source>
         <source>Variant:</source>
         <translation>变量:</translation>
     </message>
+    <message>
+        <source>Group chat</source>
+        <translation type="vanished">群聊</translation>
+    </message>
     <message>
         <location line="-556"/>
         <source>Private chat</source>
         <translation>私聊</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation>选择你的默认聊天字体</translation>
     </message>
@@ -2068,28 +2408,22 @@ Double click a chat room to enter and chat.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;对于不同的聊天系统，这个选项卡是用来设置允许RetroShare可以保存多少聊天消息，以及显示多少条过去的对话。最大存储周期允许丢弃旧消息以防滞留过多不重要的消息(比如，聊天室和年代久远的聊天记录).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Chatlobbies</source>
+        <translation type="vanished">聊天室</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Enabled:</source>
         <translation>已启用:</translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2099,17 +2433,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished">聊天室</translation>
@@ -2156,7 +2480,7 @@ Double click a chat room to enter and chat.</source>
         <location line="+208"/>
         <location line="+451"/>
         <source>Description:</source>
-        <translation type="unfinished">描述:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-605"/>
@@ -2206,7 +2530,11 @@ Double click a chat room to enter and chat.</source>
         <translation>最长存储时间，天数 (0 = 保持全部):</translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <source>Search by default</source>
+        <translation type="vanished">默认搜索</translation>
+    </message>
+    <message>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>区分大小写</translation>
     </message>
@@ -2245,6 +2573,10 @@ Double click a chat room to enter and chat.</source>
         <source>Threshold for automatic search</source>
         <translation>自动搜索的最大值</translation>
     </message>
+    <message>
+        <source>Default identity for chat lobbies:</source>
+        <translation type="vanished">聊天室的默认身份</translation>
+    </message>
     <message>
         <location line="-9"/>
         <source>Show Bar by default</source>
@@ -2312,7 +2644,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation>显示聊天</translation>
     </message>
@@ -2348,7 +2680,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
@@ -2383,12 +2715,12 @@ Double click a chat room to enter and chat.</source>
         <translation>斜体</translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation>插入表情</translation>
     </message>
@@ -2397,6 +2729,10 @@ Double click a chat room to enter and chat.</source>
         <source>Attach a Picture</source>
         <translation>附加图片</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QToolButton:disabled {&lt;/p&gt;&lt;p&gt;	image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;QT工具按钮:禁用 {&lt;/p&gt;&lt;p&gt;⇥image: url(:/icons/png/send-message-blocked.png) ;&lt;/p&gt;&lt;p&gt;}&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+165"/>
         <source>Strike</source>
@@ -2468,6 +2804,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation>插入水平线</translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation>保存图像</translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2505,7 +2846,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation>正在输入...</translation>
     </message>
@@ -2527,7 +2868,7 @@ after HTML conversion.</source>
         <translation>选择字体</translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation>您确认要删除聊天记录?</translation>
     </message>
@@ -2577,7 +2918,7 @@ after HTML conversion.</source>
         <translation>处于忙碌状态可能无法回复您的消息。</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation>区分大小写查找</translation>
     </message>
@@ -2599,7 +2940,7 @@ after HTML conversion.</source>
         <translation>X物品发现后，请勿停止着色(需要更多CPU占用)</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation>&lt;b&gt;查找以前的&lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</translation>
     </message>
@@ -2614,12 +2955,16 @@ after HTML conversion.</source>
         <translation>&lt;b&gt;查找 &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+F&lt;/i&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation>(状态)</translation>
     </message>
     <message>
-        <location line="+672"/>
+        <source>Set text font &amp; color</source>
+        <translation type="vanished">设置文字大小及颜色</translation>
+    </message>
+    <message>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation>附加文件</translation>
     </message>
@@ -2635,12 +2980,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation>&lt;b&gt;标记选择文本&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation>个人ID</translation>
     </message>
@@ -2651,12 +2996,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation>未签名</translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation>已找到</translation>
     </message>
@@ -2676,7 +3021,7 @@ Double click on it to add his name on text writer.</source>
         <translation>在此输入消息</translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation>请勿停止着色</translation>
     </message>
@@ -2702,7 +3047,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation>显示详情:</translation>
     </message>
@@ -2724,7 +3069,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation>私人圈</translation>
     </message>
@@ -2750,7 +3095,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation>好友</translation>
     </message>
@@ -2810,7 +3155,7 @@ Double click on it to add his name on text writer.</source>
         <translation>好友的好友</translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation>公共圈子(管理)</translation>
     </message>
@@ -2826,7 +3171,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation>圈子</translation>
     </message>
@@ -2878,48 +3223,43 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation>错误：无法获取节点详情。</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+29"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+15"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+8"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
@@ -2931,7 +3271,7 @@ Double click on it to add his name on text writer.</source>
         <translation>加密</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-186"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-179"/>
         <source>Not connected</source>
         <translation>未连接</translation>
     </message>
@@ -3013,17 +3353,25 @@ Double click on it to add his name on text writer.</source>
         <translation>无</translation>
     </message>
     <message>
-        <location line="+112"/>
+        <location line="+115"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation>&lt;p&gt;此证书包含：</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+21"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation>&lt;li&gt;a &lt;b&gt;节点 ID&lt;/b&gt; 和 &lt;b&gt;名字&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <source>an &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">an &lt;b&gt;洋葱地址&lt;/b&gt; 和&lt;b&gt;端口&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>an &lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
+        <translation type="vanished">an &lt;b&gt;IP地址&lt;/b&gt; 和&lt;b&gt;端口&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location line="+23"/>
         <source>&lt;p&gt;You can use this certificate to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation>&lt;p&gt;您可以使用此证书结交新朋友。通过电子邮件发送，或手动发送。&lt;/ p&gt;</translation>
     </message>
@@ -3038,7 +3386,7 @@ Double click on it to add his name on text writer.</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这个加密方式是 &lt;span style=&quot; font-weight:600;&quot;&gt;OpenSSL&lt;/span&gt;. 到好友的连接&lt;/p&gt;&lt;p&gt;是强加密的，如果有DHE&lt;/p&gt;&lt;p&gt;&amp;quot;安全效果会更加完美&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation> 和</translation>
     </message>
@@ -3055,16 +3403,118 @@ Double click on it to add his name on text writer.</source>
         <source>Connect Friend Wizard</source>
         <translation>好友连接向导</translation>
     </message>
+    <message>
+        <source>Add a new Friend</source>
+        <translation type="vanished">添加新好友</translation>
+    </message>
+    <message>
+        <source>&amp;You get a certificate file from your friend</source>
+        <translation type="vanished">&amp;通过好友的证书文件</translation>
+    </message>
+    <message>
+        <source>&amp;Make friend with selected friends of my friends</source>
+        <translation type="vanished">&amp;将好友的好友加为好友</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Email 
+ (Your friend will receive an email with instructions how to download RetroShare)</source>
+        <translation type="vanished">&amp;发送邀请邮件
+(你的好友将会受到一封RetroShare下载教程邮件)</translation>
+    </message>
+    <message>
+        <source>Include signatures</source>
+        <translation type="vanished">包含签名</translation>
+    </message>
+    <message>
+        <source>Copy your Cert to Clipboard</source>
+        <translation type="vanished">复制您的证书到剪贴板</translation>
+    </message>
+    <message>
+        <source>Save your Cert into a File</source>
+        <translation type="vanished">保存您的证书至文件</translation>
+    </message>
+    <message>
+        <source>Run Email program</source>
+        <translation type="vanished">运行 Email 程序</translation>
+    </message>
     <message>
         <location line="+67"/>
         <source>Open Cert of your friend from File</source>
         <translation>从文件打开你好友的证书</translation>
     </message>
+    <message>
+        <source>Open certificate</source>
+        <translation type="vanished">打开证书</translation>
+    </message>
+    <message>
+        <source>Please, paste your friend&apos;s Retroshare certificate into the box below</source>
+        <translation type="vanished">请粘贴你朋友的证书链接到下面的输入框</translation>
+    </message>
+    <message>
+        <source>Certificate files</source>
+        <translation type="vanished">证书文件</translation>
+    </message>
+    <message>
+        <source>Use PGP certificates saved in files.</source>
+        <translation type="vanished">使用文件中的 PGP 证书。</translation>
+    </message>
+    <message>
+        <source>Import friend&apos;s certificate...</source>
+        <translation type="vanished">导入好友证书...</translation>
+    </message>
+    <message>
+        <source>You have to generate a file with your certificate and give it to your friend. Also, you can use a file generated before.</source>
+        <translation type="vanished">您需要生成您的证书文件，将其发送给您的好友。您也可以使用之前生成过的文件。</translation>
+    </message>
+    <message>
+        <source>Export my certificate...</source>
+        <translation type="vanished">导出我的证书...</translation>
+    </message>
+    <message>
+        <source>Drag and Drop your friends&apos;s certificate in this Window or specify path in the box below</source>
+        <translation type="vanished">拖拽您的好友证书到此窗口或在下框中指定证书文件的位置</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation type="vanished">浏览</translation>
+    </message>
+    <message>
+        <source>Friends of friends</source>
+        <translation type="vanished">好友的好友</translation>
+    </message>
+    <message>
+        <source>Select now who you want to make friends with.</source>
+        <translation type="vanished">选择您要加为好友的节点。</translation>
+    </message>
+    <message>
+        <source>Show me:</source>
+        <translation type="vanished">显示：</translation>
+    </message>
+    <message>
+        <source>Make friend with these peers</source>
+        <translation type="vanished">将这些节点加为好友</translation>
+    </message>
     <message>
         <location line="-59"/>
         <source>RetroShare ID</source>
         <translation>RetroShare ID</translation>
     </message>
+    <message>
+        <source>Use RetroShare ID for adding a Friend which is available in your network.</source>
+        <translation type="vanished">使用 RetroShare ID 添加您网络中的节点为好友。</translation>
+    </message>
+    <message>
+        <source>Add Friends RetroShare ID...</source>
+        <translation type="vanished">添加好友的 RetroShare ID...</translation>
+    </message>
+    <message>
+        <source>Paste Friends RetroShare ID in the box below</source>
+        <translation type="vanished">粘贴好友的 RetroShare ID 至下框中</translation>
+    </message>
+    <message>
+        <source>Enter the RetroShare ID of your Friend, e.g. Peer@BDE8D16A46D938CF</source>
+        <translation type="vanished">输入好友的 RetroShare ID，例如：Peer@BDE8D16A46D938CF</translation>
+    </message>
     <message>
         <location line="+120"/>
         <source>RetroShare is better with Friends </source>
@@ -3106,7 +3556,27 @@ Double click on it to add his name on text writer.</source>
         <translation>邮箱</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <source>Invite Friends by Email</source>
+        <translation type="vanished">通过邮件邀请好友</translation>
+    </message>
+    <message>
+        <source>Enter your friends&apos; email addresses (separate each one with a semicolon)</source>
+        <translation type="vanished">输入您好友的 Email 地址(多个地址用分号分隔)</translation>
+    </message>
+    <message>
+        <source>Your friends&apos; email addresses:</source>
+        <translation type="vanished">您好友的邮件地址:</translation>
+    </message>
+    <message>
+        <source>Enter Friends Email addresses</source>
+        <translation type="vanished">输入好友的电子邮件地址</translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="vanished">主题:</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3122,32 +3592,77 @@ Double click on it to add his name on text writer.</source>
         <translation>请求详情</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation>节点详情</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
+    <message>
+        <source>Email:</source>
+        <translation type="vanished">Email:</translation>
+    </message>
+    <message>
+        <source>Node:</source>
+        <translation type="vanished">节点:</translation>
+    </message>
+    <message>
+        <source>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much 
+resources.</source>
+        <translation type="vanished">请注意，如果你添加太多的好友，RetroShare 将会需要大量带宽，内存和CPU占用，你可以尽可能多的加好友，但是超过40个好友可能就会占用大量资源</translation>
+    </message>
     <message>
         <location line="+52"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>选项</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <source>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</source>
+        <translation type="vanished">这个向导将帮助你连接到你的朋友(们)进入RetroShare网络，&lt;br&gt;请选择你想怎么添加你的好友</translation>
+    </message>
+    <message>
+        <source>Enter the certificate manually</source>
+        <translation type="vanished">手动输入证书</translation>
+    </message>
+    <message>
+        <source>Enter RetroShare ID manually</source>
+        <translation type="vanished">手动输入 RetroShare ID</translation>
+    </message>
+    <message>
+        <source>&amp;Send an Invitation by Web Mail Providers</source>
+        <translation type="vanished">通过网页邮箱发送邀请</translation>
+    </message>
+    <message>
+        <source>Recommend many friends to each other</source>
+        <translation type="vanished">批量推荐好友</translation>
+    </message>
+    <message>
+        <source>RetroShare certificate</source>
+        <translation type="vanished">RetroShare 证书</translation>
+    </message>
+    <message>
+        <source>Please paste below your friend&apos;s Retroshare certificate</source>
+        <translation type="vanished">请在下面粘贴你的好友的 RetroShare 证书</translation>
+    </message>
+    <message>
+        <source>Paste certificate</source>
+        <translation type="vanished">粘贴证书</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这里只能输入你的好友的RetroShare证书。 注意，这跟你好友账户的密钥是不一样的。不要再这里粘贴好友的密钥，没用的 (就算是密钥的一部分也不行)。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation>添加至好友分组:</translation>
     </message>
@@ -3157,7 +3672,7 @@ Double click on it to add his name on text writer.</source>
         <translation>为好友的 PGP 密钥签名</translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3182,22 +3697,16 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation>添加为可以建立连接的好友</translation>
     </message>
     <message>
-        <location line="-393"/>
+        <source>To accept the Friend Request, click the Finish button.</source>
+        <translation type="vanished">点击完成可接受好友请求。</translation>
+    </message>
+    <message>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation>抱歉，出现错误</translation>
     </message>
@@ -3217,27 +3726,32 @@ Double click on it to add his name on text writer.</source>
         <translation>您的好友详情:</translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation>密钥有效性:</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation>签名者</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;签署好友的钥匙是表达你对这个好友，给你的其他好友的信任的一种方式。 下面的签名加密地证明所列出的密钥的所有者将当前的PGP密钥识别为真实的&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation>此节点已经存在于您的好友列表中。重复添加仅设置其IP地址。</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3283,17 +3797,49 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation>证书载入失败</translation>
     </message>
     <message>
-        <location line="+254"/>
+        <source>Cannot get peer details of PGP key %1</source>
+        <translation type="vanished">无法获取PGP密钥 %1 的节点详情</translation>
+    </message>
+    <message>
+        <source>Any peer I&apos;ve not signed</source>
+        <translation type="vanished">任意未签名节点</translation>
+    </message>
+    <message>
+        <source>Friends of my friends who already trust me</source>
+        <translation type="vanished">我好友的好友中信任我的节点</translation>
+    </message>
+    <message>
+        <source>Signed peers showing as denied</source>
+        <translation type="vanished">显示为拒绝的已签名节点</translation>
+    </message>
+    <message>
+        <source>Peer name</source>
+        <translation type="vanished">节点名称</translation>
+    </message>
+    <message>
+        <source>Also signed by</source>
+        <translation type="vanished">其他签名者</translation>
+    </message>
+    <message>
+        <source>Peer id</source>
+        <translation type="vanished">节点 ID</translation>
+    </message>
+    <message>
+        <source>Certificate appears to be valid</source>
+        <translation type="vanished">证书似乎有效</translation>
+    </message>
+    <message>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation>不是一个有效的 RetroShare 证书！</translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare 邀请</translation>
     </message>
@@ -3315,12 +3861,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation>这是你自己的证书！你该不会是想和自己交朋友吧？</translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3328,7 +3874,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation>此密钥已经在你的信任列表中</translation>
     </message>
@@ -3368,7 +3914,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>您有一个好友请求来自</translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3393,7 +3939,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3403,7 +3949,47 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <source>Certificate Load Failed:file %1 not found</source>
+        <translation type="vanished">证书载入失败: 未找到文件 %1</translation>
+    </message>
+    <message>
+        <source>This Peer %1 is not available in your Network</source>
+        <translation type="vanished">节点 %1 在您的网络中不可用</translation>
+    </message>
+    <message>
+        <source>Use new certificate format (safer, more robust)</source>
+        <translation type="vanished">使用新证书格式(更安全，更强大)</translation>
+    </message>
+    <message>
+        <source>Use old (backward compatible) certificate format</source>
+        <translation type="vanished">使用旧证书格式(向后兼容)</translation>
+    </message>
+    <message>
+        <source>Remove signatures</source>
+        <translation type="vanished">删除签名</translation>
+    </message>
+    <message>
+        <source>RetroShare Invite</source>
+        <translation type="vanished">RetroShare 邀请</translation>
+    </message>
+    <message>
+        <source>Connect Friend Help</source>
+        <translation type="vanished">“连接好友”的帮助信息</translation>
+    </message>
+    <message>
+        <source>You can copy this text and send it to your friend via email or some other way</source>
+        <translation type="vanished">您可以复制此文本并将其通过邮件或其他方式发送给您的好友</translation>
+    </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">您的证书已复到剪切板，请将其通过邮件或其他方式发送给您的好友</translation>
+    </message>
+    <message>
+        <source>Save as...</source>
+        <translation type="vanished">另存为...</translation>
+    </message>
+    <message>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3442,7 +4028,11 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>*** 无 ***</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <source>Use as direct source, when available</source>
+        <translation type="vanished">可用时，作为直连数据源。</translation>
+    </message>
+    <message>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation>IP 地址:</translation>
     </message>
@@ -3452,7 +4042,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>IP 地址:</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation>显示高级选项</translation>
     </message>
@@ -3461,6 +4051,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;签署好友的钥匙是表达你对这个好友，给你的其他好友的信任的一种方式。 它可以帮助他们决定是否允许基于您自己的信任的密钥进行连接。 签署密钥是绝对可选的，不能撤销，所以请做出明智的选择.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare会定期检查您的好友列表中的可浏览文件与您的传输匹配，以建立直接传输。 在这种情况下，您的好友知道您正在下载文件.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;要防止此行为（仅适用于此好友），请取消选中此框。 如果您明确要求，您仍然可以执行直接传输。 从你好友的文件列表下载。 此设置应用于同一节点的所有位置.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+65"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -3471,13 +4065,45 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &amp;quot;security feed items&amp;quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt; &lt;head /&gt; &lt;body&gt; &lt;p&gt;如果连接地址不在白名单中，则具有此选项的对等人无法连接。 这样可以防止流量转发攻击。 当被使用时，被拒绝的对方将被“安全馈送项目”报告。 在新闻Feed部分。 从那里，您可以对其IP进行白名单/黑名单。 适用于同一节点的所有位置。&lt;/ p&gt; &lt;/ body&gt; &lt;/ html&gt;</translation>
     </message>
+    <message>
+        <source>Recommend many friends to each others</source>
+        <translation type="vanished">批量互荐好友</translation>
+    </message>
+    <message>
+        <source>Friend Recommendations</source>
+        <translation type="vanished">好友推荐</translation>
+    </message>
+    <message>
+        <source>The text below is your Retroshare certificate. You have to provide it to your friend</source>
+        <translation type="vanished">下面的文本是你的 RetroShare 证书。你必须提供给你的好友</translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="vanished">消息:</translation>
+    </message>
+    <message>
+        <source>Recommend friends</source>
+        <translation type="vanished">推荐好友</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">收件人</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend for recommendation.</source>
+        <translation type="vanished">请选择至少一个好友以推荐。</translation>
+    </message>
+    <message>
+        <source>Please select at least one friend as recipient.</source>
+        <translation type="vanished">请选择至少一个好友以接收。</translation>
+    </message>
     <message>
         <location line="-82"/>
         <source>Add key to keyring</source>
         <translation>将密钥添加到钥匙环中</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation>密钥已存在于您的钥匙环中</translation>
     </message>
@@ -3493,7 +4119,7 @@ even if you don&apos;t make friends.</source>
 发送远程信息有用。</translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation>证书包含错误的版本号，记住0.6版本跟0.5版本不能相互添加</translation>
     </message>
@@ -3528,7 +4154,7 @@ even if you don&apos;t make friends.</source>
         <translation>添加至白名单</translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation>证书里没有IP</translation>
     </message>
@@ -3538,10 +4164,27 @@ even if you don&apos;t make friends.</source>
         <translation>&lt;p&gt;此证书没有IP。 你会依靠节点发现和DHT找到它。 由于您需要清除白名单，节点将在NewsFeed选项卡中引发安全警告。 从那里，你可以将他的IP列入白名单。&lt;/ p&gt;</translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished">[未知]</translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation>添加来自1%的证书</translation>
     </message>
+    <message>
+        <source>Paste Cert of your friend from Clipboard</source>
+        <translation type="vanished">复制对方的证书到剪贴板</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:can&apos;t read from file %1</source>
+        <translation type="vanished">签名载入失败:无法读取文件 %1</translation>
+    </message>
+    <message>
+        <source>Certificate Load Failed:something is wrong with %1</source>
+        <translation type="vanished">证书载入失败: %1 出错</translation>
+    </message>
 </context>
 <context>
     <name>ConnectProgressDialog</name>
@@ -3603,7 +4246,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation>UDP 设置</translation>
     </message>
@@ -3631,7 +4274,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation>连接助手</translation>
     </message>
@@ -3641,20 +4284,17 @@ p, li { white-space: pre-wrap; }
         <translation>无效节点 ID</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation>未知状态</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation>离线</translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation>受限于对称 NAT</translation>
     </message>
@@ -3664,14 +4304,12 @@ p, li { white-space: pre-wrap; }
         <translation>受限于 NAT 且无 DHT</translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation>NET 重启</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation>受限于 NAT</translation>
     </message>
@@ -3681,8 +4319,7 @@ p, li { white-space: pre-wrap; }
         <translation>无 DHT</translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation>网络状况很好!</translation>
     </message>
@@ -3707,7 +4344,7 @@ p, li { white-space: pre-wrap; }
         <translation>正在探索 RS 节点</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation>查询需要 DHT</translation>
     </message>
@@ -3999,7 +4636,7 @@ p, li { white-space: pre-wrap; }
         <translation>请重试导入完整的证书</translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -4007,8 +4644,7 @@ p, li { white-space: pre-wrap; }
         <translation>不适用</translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation>端口转发状态无法确认！</translation>
     </message>
@@ -4018,7 +4654,7 @@ p, li { white-space: pre-wrap; }
         <translation>端口转发状态无法确定，无 DHT！</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation>正在搜索</translation>
     </message>
@@ -4054,12 +4690,12 @@ p, li { white-space: pre-wrap; }
         <translation>圈子详情</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4079,7 +4715,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation>ID</translation>
     </message>
@@ -4099,18 +4735,18 @@ p, li { white-space: pre-wrap; }
         <translation>过滤</translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation>昵称</translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation>已邀请成员</translation>
     </message>
@@ -4125,7 +4761,15 @@ p, li { white-space: pre-wrap; }
         <translation>认识的人</translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>ID</source>
+        <translation type="vanished">ID</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="vanished">类型</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
@@ -4165,19 +4809,23 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;圈子可以限制在另一个圈子的成员身上。 只有该第二圈的成员才能看到新圈子及其内容(成员列表等)。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <source>Only visible to members of:</source>
+        <translation type="vanished">仅对下列成员可见:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation>请为您的圈子命名</translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation>未选择受限圈子</translation>
     </message>
@@ -4187,24 +4835,12 @@ p, li { white-space: pre-wrap; }
         <translation>未选择圈子限制</translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[未知]</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
@@ -4214,7 +4850,7 @@ p, li { white-space: pre-wrap; }
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation>搜索 </translation>
@@ -4229,6 +4865,10 @@ p, li { white-space: pre-wrap; }
         <source>Signed</source>
         <translation>已签名</translation>
     </message>
+    <message>
+        <source>Signed by known nodes</source>
+        <translation type="vanished">签名者:已知节点</translation>
+    </message>
     <message>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+97"/>
         <source>Edit Circle</source>
@@ -4245,6 +4885,10 @@ p, li { white-space: pre-wrap; }
         <source>PGP Identity</source>
         <translation>PGP ID</translation>
     </message>
+    <message>
+        <source>Anon Id</source>
+        <translation type="vanished">匿名 ID</translation>
+    </message>
     <message>
         <location line="-308"/>
         <source>Circle name</source>
@@ -4267,13 +4911,17 @@ p, li { white-space: pre-wrap; }
         <translation>新建圈子</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation>创建</translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <source>PGP Linked Id</source>
+        <translation type="vanished">PGP 关联 ID</translation>
+    </message>
+    <message>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation>添加成员</translation>
     </message>
@@ -4292,7 +4940,7 @@ p, li { white-space: pre-wrap; }
         <translation>创建分组</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation>组名称:</translation>
     </message>
@@ -4327,7 +4975,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation>新频道贴文</translation>
     </message>
@@ -4337,7 +4985,7 @@ p, li { white-space: pre-wrap; }
         <translation>邮件</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4398,11 +5046,23 @@ 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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;使用拖放 / 添加文件按钮, Hash 新文件。&lt;/span&gt;&lt;/p&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;img src=&quot;:/images/feedback_arrow.png&quot; /&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; 从你的分享复制/粘贴 RetroShare 链接&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>Add File to Attach</source>
+        <translation type="vanished">附加文件</translation>
+    </message>
     <message>
         <location line="+18"/>
         <source>Add Channel Thumbnail</source>
         <translation>添加频道缩略图</translation>
     </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">消息</translation>
+    </message>
+    <message>
+        <source>Subject :</source>
+        <translation type="vanished">主题:</translation>
+    </message>
     <message>
         <location line="+371"/>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+402"/>
@@ -4488,17 +5148,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4517,18 +5177,17 @@ p, li { white-space: pre-wrap; }
         <source>The following files will only be shared for 30 days. Think about adding them to a shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>File already Added and Hashed</source>
+        <translation type="vanished">文件已添加并生成散列校验值</translation>
+    </message>
     <message>
         <location line="+11"/>
         <source>Please add a Subject</source>
         <translation>请添加主题</translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation>载入图片缩略图</translation>
     </message>
@@ -4543,12 +5202,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation>生成大量数据</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation>你真的想生成 ％1 消息吗？</translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation>你正在添加未分享的文件，仍想继续?</translation>
     </message>
@@ -4582,7 +5247,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation>论坛发帖</translation>
     </message>
@@ -4591,6 +5256,10 @@ p, li { white-space: pre-wrap; }
         <source>Forum</source>
         <translation>论坛</translation>
     </message>
+    <message>
+        <source>Subject</source>
+        <translation type="vanished">主题</translation>
+    </message>
     <message>
         <location line="+75"/>
         <source>Attach File</source>
@@ -4611,8 +5280,8 @@ p, li { white-space: pre-wrap; }
         <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4631,7 +5300,7 @@ p, li { white-space: pre-wrap; }
         <translation>您可以通过拖拽在此窗口中添加文件</translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4661,17 +5330,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation>无论坛</translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation>回复</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">标题</translation>
     </message>
@@ -4724,7 +5393,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">载入图片文件</translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation>没有兼容此论坛的 ID</translation>
     </message>
@@ -4734,8 +5403,8 @@ Do you want to discard this message?</source>
         <translation>您的身份不允许在此论坛中发布。 这可能是由于论坛限于一个不包含您的身份的圈子，或者论坛需要PGP签名的身份。</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation>生成大量数据</translation>
     </message>
@@ -4744,6 +5413,10 @@ Do you want to discard this message?</source>
         <source>Do you really want to generate %1 messages ?</source>
         <translation>你真的想生成 ％1 消息吗？</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">发送</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-236"/>
         <source>Post as</source>
@@ -4758,7 +5431,23 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <source>Create Chat Lobby</source>
+        <translation type="vanished">新建聊天室</translation>
+    </message>
+    <message>
+        <source>A chat lobby is a decentralized and anonymous chat group. All participants receive all messages. Once the lobby is created you can invite other friends from the Friends tab.</source>
+        <translation type="vanished">聊天室是分布式的匿名群组聊天。每个参加者都可以收到全部消息。一旦聊天室创建成功，您可以从好友标签页中邀请其他好友。</translation>
+    </message>
+    <message>
+        <source>Lobby name:</source>
+        <translation type="vanished">聊天室名称:</translation>
+    </message>
+    <message>
+        <source>Lobby topic:</source>
+        <translation type="vanished">聊天室主题:</translation>
+    </message>
+    <message>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4793,7 +5482,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished">创建</translation>
     </message>
@@ -4803,7 +5492,11 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-120"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you check this, only PGP-signed ids can be used to join and talk in this lobby. This limitation prevents anonymous spamming as it becomes possible for at least some people in the lobby to locate the spammer&apos;s node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果您检查这个，只有PGP签名的ID可以在这个大厅加入和谈话。 这个限制防止匿名垃圾邮件发送，因为大厅中的至少一些人可能找到垃圾邮件发送者的节点&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation>需要 PGP 签名的身份</translation>
     </message>
@@ -4818,7 +5511,11 @@ Do you want to discard this message?</source>
         <translation>选择群聊好友</translation>
     </message>
     <message>
-        <location line="-159"/>
+        <source>Invited friends</source>
+        <translation type="vanished">已邀请好友</translation>
+    </message>
+    <message>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation>创建聊天室</translation>
@@ -4839,7 +5536,7 @@ Do you want to discard this message?</source>
         <translation>联系人:</translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation>使用身份</translation>
     </message>
@@ -4847,17 +5544,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation>公开信息</translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
@@ -4867,12 +5564,12 @@ Do you want to discard this message?</source>
         <translation>地点 ID：</translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation>软件版本:</translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation>在线始于:</translation>
     </message>
@@ -4892,7 +5589,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4902,7 +5604,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation>其它信息</translation>
     </message>
@@ -4912,12 +5614,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation>证书</translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4927,7 +5634,11 @@ Do you want to discard this message?</source>
         <translation>包含签名</translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <source>Save Key into a file</source>
+        <translation type="vanished">保存密钥到文件</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished">导出身份</translation>
     </message>
@@ -5001,33 +5712,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation>文本标签</translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation>PGP 指纹: </translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation>节点信息</translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation>PGP Id :</translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation>好友节点:</translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5066,6 +5777,14 @@ and use the import button to load it</source>
         <source>Node</source>
         <translation>节点</translation>
     </message>
+    <message>
+        <source>Create new node...</source>
+        <translation type="vanished">新建节点</translation>
+    </message>
+    <message>
+        <source>show statistics window</source>
+        <translation type="vanished">显示统计窗口</translation>
+    </message>
 </context>
 <context>
     <name>DHTGraphSource</name>
@@ -5082,6 +5801,10 @@ and use the import button to load it</source>
         <source>DHT</source>
         <translation>DHT</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your friends to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;RetroShare使用Bittorrent的DHT作为连接的代理。 它不会将您的IP存储在DHT中.。				                        相反，您的好友可以使用DHT来处理标准的DHT请求。 												一旦RetroShare从您的一个好友获得DHT响应，状态栏符号将变为绿色。&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>&lt;p&gt;Retroshare uses Bittorrent&apos;s DHT as a proxy for connexions. It does not &quot;store&quot; your IP in the DHT. 				                        Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. 												The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.&lt;/p&gt;</source>
@@ -5117,7 +5840,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation>B</translation>
     </message>
@@ -5785,7 +6508,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation>启动文件任务</translation>
     </message>
@@ -5793,38 +6516,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation>至</translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation>忽略大小写</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
-        <translation type="unfinished"></translation>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
+        <translation>dd.MM.yyyy</translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
@@ -5832,12 +6555,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation>表情部件</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation>删掉这个表达式</translation>
     </message>
@@ -5999,7 +6722,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation>图片</translation>
     </message>
@@ -6009,7 +6732,7 @@ and use the import button to load it</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
@@ -6069,21 +6792,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation>C</translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation>好友目录</translation>
     </message>
@@ -6205,7 +6918,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
@@ -6240,6 +6953,10 @@ and use the import button to load it</source>
         <source>Show State</source>
         <translation>显示状态</translation>
     </message>
+    <message>
+        <source>Trusted nodes</source>
+        <translation type="vanished">信任的节点</translation>
+    </message>
     <message>
         <location line="+8"/>
         <location line="+3"/>
@@ -6247,7 +6964,7 @@ and use the import button to load it</source>
         <translation>显示分组</translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation>分组</translation>
     </message>
@@ -6283,7 +7000,7 @@ and use the import button to load it</source>
         <translation>添加至分组</translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation>搜索</translation>
@@ -6299,7 +7016,7 @@ and use the import button to load it</source>
         <translation>以状态分类</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation>用户信息</translation>
     </message>
@@ -6541,7 +7258,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation>确认好友请求</translation>
     </message>
@@ -6558,6 +7275,10 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>FriendSelectionWidget</name>
+    <message>
+        <source>Search :</source>
+        <translation type="vanished">搜索 ：</translation>
+    </message>
     <message>
         <location filename="../gui/common/FriendSelectionWidget.cpp" line="+108"/>
         <source>Sort by state</source>
@@ -6579,7 +7300,7 @@ at least one peer was not added to a group</source>
         <translation>搜索好友</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation>标记全部</translation>
     </message>
@@ -6590,134 +7311,16 @@ at least one peer was not added to a group</source>
         <translation>取消标记</translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished">地址</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished">状态</translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished">接受好友</translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished">代理未启用或中断。
-所有服务都开启并正常运行吗？
-另外请检查您的端口！</translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation>编辑状态消息</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation>广播</translation>
     </message>
@@ -6800,38 +7403,33 @@ Also check your ports!</source>
         <translation>重置为默认字体</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation>钥匙环</translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;网络&lt;/h1&gt;                                       &lt;p&gt;“网络”选项卡显示您的好友RetroShare节点：与您连接的相邻RetroShare节点。    &lt;/p&gt;                                                       &lt;p&gt;您可以将节点分组在一起，以允许设置更精细的信息访问级别，例如仅允许某些节点查看某些文件。&lt;/p&gt;     &lt;p&gt;在右边，你会发现3个有用的选项卡：                                                                     &lt;ul&gt;                                                                                                                &lt;li&gt;广播一次向所有连接的节点发送消息&lt;/li&gt;                                   &lt;li&gt;本地网络图根据节点发现信息显示您周围的网络&lt;/li&gt;                       &lt;li&gt;密钥环包含您收集的节点密钥，主要由您的好友节点转发给您&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation>RetroShare 广而告之：此处的消息会发给当前连接的所有好友。</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation>网络</translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation>网络图表</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation>在这里设置你的状态消息。</translation>
     </message>
@@ -6849,17 +7447,7 @@ Also check your ports!</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation>所有字段都需要最少3个字符</translation>
     </message>
@@ -6869,12 +7457,17 @@ Also check your ports!</source>
         <translation>密码不符</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation>端口</translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation>这是保护PGP密钥的密码。</translation>
@@ -6895,38 +7488,42 @@ Also check your ports!</source>
         <translation>新证书生成失败，可能您的 PGP 密码有误! </translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;请输入一个强壮的密码。您需要靠它保护您的 PGP 密钥。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;请移动鼠标以尽可能多地收集随机性。至少需要达到20％来创建你的节点密钥。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation>标准节点</translation>
     </message>
     <message>
-        <location line="+196"/>
+        <source>TOR/I2P Hidden node</source>
+        <translation type="vanished">TOR/I2P 隐藏节点</translation>
+    </message>
+    <message>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;您的节点名称指定将在此计算机上运行的RetroShare实例。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation>节点名称</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6946,12 +7543,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;用户档案文件名称通过网络识别您。&lt;/p&gt;&lt;p&gt;您的好友使用它来接受您的连接。&lt;/p&gt;&lt;p&gt;您可以在不同的计算机上创建具有&lt;/p&gt;&lt;p&gt;同一个用户档案的多个RetroShare节点。&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation>导出账户文件</translation>
     </message>
@@ -6961,43 +7558,42 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; 这里应该是洋葱的隐藏地址格式: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;或者是I2P的格式 : [52 个字符].b32.i2p &lt;/p&gt;&lt;p&gt; 你必须通过建立Tor/I2P隐藏服务才能获得一个地址。&lt;/p&gt;&lt;p&gt; 当然你现在也可以留空，但是只有你正确配置了Tor/I2p地址过后才能正常工作。配置在选项-&amp;gt；网络-&amp;gt；隐藏服务配置。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;I在你聊天室，论坛，频道评论中发东西时需要使用身份。&lt;/p&gt;&lt;p&gt;他们也使用RetroShare的网络来收发邮件。你可以立即创建&lt;/p&gt;&lt;p&gt;签名身份，或在你需要的时候再创建。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation>开始！</translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <source>Advanced options</source>
+        <translation type="vanished">高级选项</translation>
+    </message>
+    <message>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation>隐藏地址</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation>您的用户档案与PGP密钥相关联。RetroShare目前忽略DSA密钥。</translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这是你的连接端口。&lt;/p&gt;&lt;p&gt;1024到65535之间的任何值&lt;/p&gt;&lt;p&gt;都可以。你可以在以后更改&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -7045,13 +7641,13 @@ and use the import button to load it</source>
         <translation>您的用户档案未保存。有错误发生。</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation>导入用户档案</translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation>创建新的用户档案和RetroShare节点</translation>
     </message>
@@ -7061,7 +7657,7 @@ and use the import button to load it</source>
         <translation>新建 RetroShare 节点</translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7096,7 +7692,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7106,7 +7702,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7116,7 +7717,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7342,13 +7948,36 @@ and use the import button to load it</source>
         <translation>入门指南</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation>邀请好友</translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&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;
+&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:12pt;&quot;&gt;离开好友，RetroShare 就失去了意义。点击按钮开始添加好友。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;将您的 &quot;ID 证书&quot; 通过电邮邀请发送给您的好友。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;请记得获得回请...&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;只有均已加对方为好友的节点之间才能相互连接。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation>添加您的好友至 RetroShare</translation>
     </message>
@@ -7358,103 +7987,131 @@ and use the import button to load it</source>
         <translation>添加好友</translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation>连接到好友</translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&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;
+&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:12pt;&quot;&gt;和你的好友同时在线，RetroShare将会自动连接你&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;在你创建连接之前，你的客户端必须能找到RetroShare网络。&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt; 你第一次开启RetroShare时将会花费5-30分钟在&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt; 当能创建连接的时候DHT指示器会(状态栏) 变成绿色。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt; 几分钟之后，NAT指示器 (也是状态栏) 变成黄色或绿色&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;如果它仍然是红色，那么你有一个讨厌的防火墙，RetroShare会努力连接。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;有关连接的更多建议，请参阅更多帮助部分。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;/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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&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;
 &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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
-        <translation>高级:打开防火端口</translation>
+&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:12pt;&quot;&gt;您可以通过打开外部端口改善 RetroShare 的网络性能。&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;这可以加快程序的连接速度，让更多的节点与您相连。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;最简单的方式是启用您路由中的 UPnP 自动映射功能。&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;由于各路由器的设置不尽相同，您需要知道您的路由器型号，在网上搜索具体的设置说明。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;如果这些都不管用，不必担心，RetroShare 仍能正常工作。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location line="+48"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&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;
+&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:12pt;&quot;&gt;是否在初次使用 RetroShare 时遇到问题? &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) 请查看 FAQ Wiki。虽然其中内容略显陈旧，但我们正在努力更新。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) 查看在线论坛。提出问题并讨论程序功能。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) 尝试 RetroShare 内的论坛功能&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- 这些论坛将在您与好友建立连接后上线。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) 如果您仍有困难，请电邮联系我们。&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation>连接到好友</translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation>高级:打开防火端口</translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation>更多帮助与支持</translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation>访问 RS 网站</translation>
     </message>
@@ -7479,7 +8136,7 @@ p, li { white-space: pre-wrap; }
         <translation>反馈电邮</translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation>RetroShare 邀请</translation>
     </message>
@@ -7529,12 +8186,12 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare 反馈</translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation>RetroShare 支持</translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation>他拥有多种功能，包括内置的聊天，传信等。</translation>
     </message>
@@ -7658,7 +8315,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation>显示群组聊天</translation>
     </message>
@@ -7666,7 +8323,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation>[未知]</translation>
     </message>
@@ -7832,11 +8489,19 @@ p, li { white-space: pre-wrap; }
         <source>You can let your friends know about your forum by sharing it with them. Select the friends with which you want to share your forum.</source>
         <translation>您可以通过与他们分享让您的好友知道您的论坛。 选择您要与之共享论坛的好友。</translation>
     </message>
+    <message>
+        <source>Share topic admin permissions</source>
+        <translation type="vanished">共享话题的管理权限</translation>
+    </message>
+    <message>
+        <source>You can allow your friends to edit the topic. Select them in the list below. Note: it is not possible to revoke Posted admin permissions.</source>
+        <translation type="vanished">您可以允许您的好友编辑主题。 在下面的列表中选择它们。 注意：无法撤销发布的管理员权限。</translation>
+    </message>
 </context>
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>标题</translation>
     </message>
@@ -7849,12 +8514,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7879,7 +8544,31 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <source>Sort Descending Order</source>
+        <translation type="vanished">按降序排列</translation>
+    </message>
+    <message>
+        <source>Sort Ascending Order</source>
+        <translation type="vanished">按升序排列</translation>
+    </message>
+    <message>
+        <source>Sort by Name</source>
+        <translation type="vanished">按名称排序</translation>
+    </message>
+    <message>
+        <source>Sort by Popularity</source>
+        <translation type="vanished">按活跃度排序</translation>
+    </message>
+    <message>
+        <source>Sort by Last Post</source>
+        <translation type="vanished">按新贴文排序</translation>
+    </message>
+    <message>
+        <source>Sort by Unread</source>
+        <translation type="vanished">按未读信息分类</translation>
+    </message>
+    <message>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation>你是管理员(修改名字和描述请用编辑菜单)</translation>
     </message>
@@ -7894,14 +8583,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation>最新贴文</translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7912,13 +8601,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">活跃度</translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation>从不</translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <source>Display</source>
+        <translation type="vanished">显示</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7931,7 +8624,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation>与</translation>
     </message>
@@ -8067,7 +8760,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation>频道</translation>
@@ -8078,22 +8771,26 @@ p, li { white-space: pre-wrap; }
         <translation>创建频道</translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation>启用自动下载</translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation>我的频道</translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;频道&lt;/h1&gt;        &lt;p&gt; 频道里你可以推送 (比如电影, 音乐) ，这些会传输到网络的各处&lt;/p&gt;                &lt;p&gt;您可以看到您的好友订阅的频道，并自动将订阅频道转发给您的好友。这促进了网络中的良好沟通。&lt;/p&gt;    &lt;p&gt;只有频道的创建者可以在该频道上发布。 网络中的其他对等体只能从其中读取，除非该信道是私有的。然而，您可以 	 与好友的RetroShare节点共享发布权限或阅读权限。&lt;/p&gt;	 &lt;p&gt; 频道也能设置为匿名的，或附加到RetroShare身份，	以便读者可以在需要时联系您。&lt;/p&gt;    &lt;p&gt; 频道推送能保存 %1 days, 能同步%2天以内的消息，除非你修改了这个。&lt;/p&gt;                </translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation>订阅的频道</translation>
     </message>
@@ -8113,12 +8810,12 @@ p, li { white-space: pre-wrap; }
         <translation>选择频道下载目录</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation>禁用自动下载</translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation>设置下载目录</translation>
     </message>
@@ -8153,22 +8850,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished">播放</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation>打开文件夹</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -8188,17 +8885,17 @@ p, li { white-space: pre-wrap; }
         <translation>检查中</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation>您确定要取消和删除这些文件吗?</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation>无法打开文件夹</translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished">播放文件</translation>
     </message>
@@ -8208,10 +8905,37 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">文件位置 %1 不存在。</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">表单</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">文件名</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="vanished">大小</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">标题</translation>
+    </message>
+    <message>
+        <source>Published</source>
+        <translation type="vanished">已发布</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="vanished">状态</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation>新建频道</translation>
     </message>
@@ -8249,19 +8973,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
+        <translation>订阅频道</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -8275,7 +8989,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -8290,7 +9004,7 @@ p, li { white-space: pre-wrap; }
         <translation>频道描述</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation>正在载入</translation>
     </message>
@@ -8305,9 +9019,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished">从不</translation>
+        <source>New Channel</source>
+        <translation type="vanished">新频道</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -8318,7 +9031,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation>新评论：</translation>
     </message>
@@ -8339,7 +9052,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
@@ -8395,24 +9108,28 @@ p, li { white-space: pre-wrap; }
         <source>Files</source>
         <translation>文件</translation>
     </message>
+    <message>
+        <source>Warning! You have less than %1 hours and %2 minute before this file is deleted Consider saving it.</source>
+        <translation type="vanished">警告! 距离文件删除，您还有 %1 小时 %2 分，请考虑保存。</translation>
+    </message>
     <message>
         <location line="+183"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>新</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation>评论***</translation>
     </message>
@@ -8427,17 +9144,21 @@ p, li { white-space: pre-wrap; }
         <translation>踩</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <source>Loading</source>
+        <translation type="vanished">正在载入</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8462,16 +9183,135 @@ p, li { white-space: pre-wrap; }
         <translation>播放影音</translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Post to Channel</source>
+        <translation type="vanished">发布至频道</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">正在载入</translation>
+    </message>
+    <message>
+        <source>Search channels</source>
+        <translation type="vanished">搜索频道</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">标题</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">搜索标题</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="vanished">信息</translation>
+    </message>
+    <message>
+        <source>Search Message</source>
+        <translation type="vanished">搜索消息</translation>
+    </message>
+    <message>
+        <source>Filename</source>
+        <translation type="vanished">文件名</translation>
+    </message>
+    <message>
+        <source>Search Filename</source>
+        <translation type="vanished">搜索文件名</translation>
+    </message>
+    <message>
+        <source>No Channel Selected</source>
+        <translation type="vanished">未选择频道! </translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="vanished">从不</translation>
+    </message>
+    <message>
+        <source>Public</source>
+        <translation type="vanished">公共</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle &quot;</source>
+        <translation type="vanished">仅限于圈子的成员</translation>
+    </message>
+    <message>
+        <source>Restricted to members of circle </source>
+        <translation type="vanished">仅限于圈子的成员</translation>
+    </message>
+    <message>
+        <source>Your eyes only</source>
+        <translation type="vanished">只有你能看见</translation>
+    </message>
+    <message>
+        <source>You and your friend nodes</source>
+        <translation type="vanished">你和你好友的节点</translation>
+    </message>
+    <message>
+        <source>Disable Auto-Download</source>
+        <translation type="vanished">禁用自动下载</translation>
+    </message>
+    <message>
+        <source>Enable Auto-Download</source>
+        <translation type="vanished">启用自动下载</translation>
+    </message>
+    <message>
+        <source>Show feeds</source>
+        <translation type="vanished">显示feeds</translation>
+    </message>
+    <message>
+        <source>Show files</source>
+        <translation type="vanished">显示文件</translation>
+    </message>
+    <message>
+        <source>Administrator:</source>
+        <translation type="vanished">管理员：</translation>
+    </message>
+    <message>
+        <source>Last Post:</source>
+        <translation type="vanished">最新贴文</translation>
+    </message>
+    <message>
+        <source>unknown</source>
+        <translation type="vanished">未知</translation>
+    </message>
+    <message>
+        <source>Distribution:</source>
+        <translation type="vanished">传播范围</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">订阅</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="vanished">文件</translation>
+    </message>
+    <message>
+        <source>Subscribers</source>
+        <translation type="vanished">订阅</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">描述： </translation>
+    </message>
+    <message>
+        <source>Posts (at neighbor nodes):</source>
+        <translation type="vanished">贴文(相邻节点)</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished">发布至频道</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8541,7 +9381,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8577,7 +9417,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8592,13 +9432,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">订阅</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8613,7 +9453,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8628,7 +9468,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8688,22 +9528,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8760,17 +9590,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished">仅限于圈子的成员&quot;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished">仅限于圈子的成员 </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your eyes only</source>
-        <translation type="unfinished">只有你能看见 </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -8778,13 +9608,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">你和你好友的节点</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished">已订阅</translation>
     </message>
@@ -8835,17 +9664,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8960,7 +9789,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation>评论容器</translation>
     </message>
@@ -8973,7 +9802,7 @@ p, li { white-space: pre-wrap; }
         <translation>表格</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9003,7 +9832,7 @@ p, li { white-space: pre-wrap; }
         <translation>刷新</translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation>评论</translation>
@@ -9042,7 +9871,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation>回复评论</translation>
     </message>
@@ -9066,21 +9895,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation>踩</translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9090,7 +9904,7 @@ p, li { white-space: pre-wrap; }
         <translation>发表评论</translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9119,10 +9933,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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:12pt; font-weight:600;&quot;&gt;Comment&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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:12pt; font-weight:600;&quot;&gt;评论&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Signed by</source>
+        <translation type="vanished">签名者</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsCreateCommentDialog.cpp" line="+47"/>
         <source>Reply to Comment</source>
@@ -9150,7 +9980,7 @@ before you can comment</source>
         <translation>评论前您需要先创建身份</translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9192,6 +10022,14 @@ before you can comment</source>
         <source>Forum moderators can edit/delete/pinup others posts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add Forum Admins</source>
+        <translation type="vanished">添加论坛管理员</translation>
+    </message>
+    <message>
+        <source>Select Forum Admins</source>
+        <translation type="vanished">选择论坛管理员</translation>
+    </message>
     <message>
         <location line="-11"/>
         <source>Create</source>
@@ -9201,7 +10039,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation>订阅论坛</translation>
     </message>
@@ -9217,7 +10055,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -9237,9 +10075,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <source>Loading</source>
+        <translation type="vanished">正在载入</translation>
     </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
@@ -9270,13 +10107,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation>主题:</translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation>退订论坛</translation>
     </message>
@@ -9287,7 +10124,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -9307,17 +10144,21 @@ before you can comment</source>
         <translation>回复</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <source>Loading</source>
+        <translation type="vanished">正在载入</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation>论坛feed</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
@@ -9330,66 +10171,63 @@ before you can comment</source>
         <translation>表格</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation>新建主题帖</translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>搜索论坛</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <source>Last Post</source>
+        <translation type="vanished">最新贴文</translation>
+    </message>
+    <message>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished">新帖子</translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation>话题视图</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation>普通视图</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>标题</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation>保存图像</translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation>正在载入</translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9399,7 +10237,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation>回复贴文</translation>
     </message>
@@ -9423,6 +10266,10 @@ before you can comment</source>
         <source>Download all files</source>
         <translation>下载全部文件</translation>
     </message>
+    <message>
+        <source>Next unread</source>
+        <translation type="vanished">下一条未读</translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-2"/>
         <source>Search Title</source>
@@ -9439,23 +10286,35 @@ before you can comment</source>
         <translation>搜索作者</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <source>Content</source>
+        <translation type="vanished">内容</translation>
+    </message>
+    <message>
+        <source>Search Content</source>
+        <translation type="vanished">搜索内容</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Subscribing to the forum will gather 	                                        available posts from your subscribed friends, and make the 	                                        forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
+        <translation type="vanished">&lt;p&gt;订阅论坛将收集 	                                        您订阅的好友的 	                                        可用帖子。&lt;/p&gt;&lt;p&gt;之后，您可以从左侧的论坛列表的上下文菜单中取消订阅。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+178"/>
         <source>No name</source>
         <translation>未命名</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation>回复</translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9498,12 +10357,20 @@ before you can comment</source>
         <translation>复制 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">展开</translation>
+    </message>
+    <message>
+        <source>[Banned]</source>
+        <translation type="vanished">[被屏蔽的]</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation>[未知]</translation>
     </message>
@@ -9533,8 +10400,8 @@ before you can comment</source>
         <translation>只有你能看见 </translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation>传播范围</translation>
     </message>
@@ -9548,6 +10415,26 @@ before you can comment</source>
         <source>Anti-spam</source>
         <translation>反垃圾</translation>
     </message>
+    <message>
+        <source>[ ... Redacted message ... ]</source>
+        <translation type="vanished">[ ... 丢失消息 ... ]</translation>
+    </message>
+    <message>
+        <source>Anonymous</source>
+        <translation type="vanished">匿名</translation>
+    </message>
+    <message>
+        <source>signed</source>
+        <translation type="vanished">已签名</translation>
+    </message>
+    <message>
+        <source>none</source>
+        <translation type="vanished">无</translation>
+    </message>
+    <message>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="vanished">[ ... 丢失消息 ... ]</translation>
+    </message>
     <message>
         <location line="+194"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
@@ -9617,12 +10504,16 @@ before you can comment</source>
         <translation>原始贴文</translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <source>Read status</source>
+        <translation type="vanished">读取状态</translation>
+    </message>
+    <message>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">编辑</translation>
     </message>
@@ -9683,7 +10574,7 @@ before you can comment</source>
         <translation>作者的信誉</translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9703,7 +10594,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation>如果匿名账户/未知节点评分是正的，允许发帖</translation>
     </message>
@@ -9755,7 +10646,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9765,7 +10656,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9780,7 +10671,28 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <source>Information for this identity is currently missing.</source>
+        <translation type="vanished">这个身份的信息现在丢失了</translation>
+    </message>
+    <message>
+        <source>You have banned this ID. The message will not be
+displayed nor forwarded to your friends.</source>
+        <translation type="vanished">您已屏蔽此ID。 该消息将不会显示，也不会转发给您的好友。</translation>
+    </message>
+    <message>
+        <source>You have not set an opinion for this person,
+ and your friends do not vote positively: Spam regulation 
+prevents the message to be forwarded to your friends.</source>
+        <translation type="vanished">您未曾设置过对此人的评价，
+您的好友们也没有对此人有正面评判。
+防垃圾邮件规则阻止了向您的好友转发此消息。</translation>
+    </message>
+    <message>
+        <source>Message will be forwarded to your friends.</source>
+        <translation type="vanished">信息将被转发给你的好友</translation>
+    </message>
+    <message>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9789,6 +10701,10 @@ This message is missing. You should receive it later.</source>
         <source>(Old) </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You cant act on the author to a non-existant Message</source>
+        <translation type="vanished">你不能对不存在的消息指定作者</translation>
+    </message>
     <message>
         <location line="+403"/>
         <source>From</source>
@@ -9846,12 +10762,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
+        <translation>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;论坛&lt;/h1&gt;               			&lt;p&gt;RetroShare 论坛看起来像互联网论坛，但他们以分散的方式工作&lt;/p&gt;    			&lt;p&gt;您会看到您的好友订阅的论坛，并将订阅的论坛转发给      			你的好友。这将自动促进网络中有趣的论坛的发展。&lt;/p&gt;                        &lt;p&gt;论坛信息会保存%1 天并且会同步最后%2天的内容，除非你有另外的配置&lt;/p&gt;                </translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>论坛</translation>
@@ -9882,16 +10798,35 @@ This message is missing. You should receive it later.</source>
         <translation>其他论坛</translation>
     </message>
 </context>
+<context>
+    <name>GxsForumsFillThread</name>
+    <message>
+        <source>Waiting</source>
+        <translation type="vanished">等待中</translation>
+    </message>
+    <message>
+        <source>Retrieving</source>
+        <translation type="vanished">正在获取</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">正在载入</translation>
+    </message>
+</context>
 <context>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location line="-429"/>
+        <source>Add Icon</source>
+        <translation type="vanished">添加图标</translation>
+    </message>
+    <message>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation>密钥接收者可以在受限小组中发帖，可以在个人频道中发帖和浏览。</translation>
     </message>
@@ -9900,14 +10835,22 @@ This message is missing. You should receive it later.</source>
         <source>Share Publish Key</source>
         <translation>分享发帖密钥</translation>
     </message>
+    <message>
+        <source>check peers you would like to share private publish key with</source>
+        <translation type="vanished">选择您希望与之共享个人发帖密钥的节点</translation>
+    </message>
+    <message>
+        <source>Share Key With</source>
+        <translation type="vanished">密钥共享给</translation>
+    </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation>传播范围</translation>
     </message>
@@ -9915,7 +10858,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation>公开</translation>
     </message>
@@ -9934,6 +10877,14 @@ This message is missing. You should receive it later.</source>
         <source>New Thread</source>
         <translation>新帖子</translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="vanished">必需</translation>
+    </message>
+    <message>
+        <source>Encrypted Msgs</source>
+        <translation type="vanished">加密消息</translation>
+    </message>
     <message>
         <location line="+37"/>
         <source>Personal Signatures</source>
@@ -9975,7 +10926,7 @@ This message is missing. You should receive it later.</source>
         <translation>垃圾信息保护</translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation>评论:</translation>
     </message>
@@ -9998,7 +10949,7 @@ This message is missing. You should receive it later.</source>
         <translation>反垃圾</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10014,12 +10965,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation>仅限于圈子</translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation>限于你的好友</translation>
     </message>
@@ -10036,23 +10987,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation>消息追踪</translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation>需要 PGP 签名</translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation>从不</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation>仅分组中的好友节点</translation>
     </message>
@@ -10068,28 +11019,30 @@ This message is missing. You should receive it later.</source>
         <translation>请添加名称</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation>需要已知ID的 PGP 签名</translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation>加载小组Logo</translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation>提交群组更改</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <source>Failed to Prepare Group MetaData - please Review</source>
+        <translation type="vanished">群组元数据准备失败-请查阅</translation>
+    </message>
+    <message>
+        <source>Will be used to send feedback</source>
+        <translation type="vanished">将用于发送反馈 </translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation>拥有着:</translation>
     </message>
@@ -10099,12 +11052,12 @@ This message is missing. You should receive it later.</source>
         <translation>在此设置描述性介绍</translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
@@ -10114,7 +11067,7 @@ This message is missing. You should receive it later.</source>
         <translation>最新贴文</translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10189,12 +11142,7 @@ This message is missing. You should receive it later.</source>
         <translation>取消收藏来自未知节点的未签名ID</translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation>活跃度</translation>
     </message>
@@ -10210,22 +11158,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished">创建</translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>作者</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation>GXS ID 标签</translation>
     </message>
@@ -10233,7 +11186,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation>正在载入</translation>
     </message>
@@ -10293,7 +11246,7 @@ This message is missing. You should receive it later.</source>
         <translation>编辑详情</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation>同步最后的贴文...</translation>
     </message>
@@ -10350,12 +11303,16 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <source>Share publish permissions</source>
+        <translation type="vanished">共享发布权限</translation>
+    </message>
+    <message>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation>复制 RetroShare 链接</translation>
     </message>
@@ -10378,7 +11335,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation>无签名</translation>
     </message>
@@ -10391,24 +11348,40 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <source>Loading</source>
+        <translation type="vanished">正在载入</translation>
+    </message>
+    <message>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation>未找到</translation>
     </message>
+    <message>
+        <source>No Signature</source>
+        <translation type="vanished">无签名</translation>
+    </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation>[被屏蔽的] </translation>
     </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="vanished">验证</translation>
+    </message>
     <message>
         <location line="+22"/>
         <source>unknown Key</source>
         <translation>未知密钥</translation>
     </message>
     <message>
-        <location line="-130"/>
+        <source>anonymous</source>
+        <translation type="vanished">匿名</translation>
+    </message>
+    <message>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10418,12 +11391,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation>身份 名称</translation>
     </message>
@@ -10437,20 +11405,16 @@ This message is missing. You should receive it later.</source>
         <source>Node</source>
         <translation type="unfinished">节点</translation>
     </message>
+    <message>
+        <source>Signed&amp;nbsp;by</source>
+        <translation type="vanished">签名者</translation>
+    </message>
     <message>
         <location line="-14"/>
         <source>[Unknown]</source>
         <translation>[未知]</translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10462,7 +11426,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10510,13 +11474,17 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished">[未知]</translation>
     </message>
 </context>
 <context>
     <name>GxsMessageFramePostWidget</name>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">正在载入</translation>
+    </message>
     <message>
         <location filename="../gui/gxs/GxsMessageFramePostWidget.cpp" line="+54"/>
         <source>Loading...</source>
@@ -10680,6 +11648,41 @@ This message is missing. You should receive it later.</source>
         <translation>否</translation>
     </message>
 </context>
+<context>
+    <name>GxsTunnelsDialog</name>
+    <message>
+        <source>Authenticated tunnels:</source>
+        <translation type="vanished">已验证的路由</translation>
+    </message>
+    <message>
+        <source>Tunnel ID: %1</source>
+        <translation type="vanished">路由 ID:%1</translation>
+    </message>
+    <message>
+        <source>from: %1</source>
+        <translation type="vanished">来自: %1</translation>
+    </message>
+    <message>
+        <source>to: %1</source>
+        <translation type="vanished">到: %1</translation>
+    </message>
+    <message>
+        <source>status: %1</source>
+        <translation type="vanished">状态:%1</translation>
+    </message>
+    <message>
+        <source>total sent: %1 bytes</source>
+        <translation type="vanished">总共发送: 1% bytes</translation>
+    </message>
+    <message>
+        <source>total recv: %1 bytes</source>
+        <translation type="vanished">总共收到: 1% bytes</translation>
+    </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">未知节点</translation>
+    </message>
+</context>
 <context>
     <name>HashBox</name>
     <message>
@@ -10892,12 +11895,48 @@ This message is missing. You should receive it later.</source>
         <source>About</source>
         <translation>关于</translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;using a web-of-trust to authenticate peers and OpenSSL to encrypt all communication. &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare provides file sharing, chat, messages and channels&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Useful external links to more information:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;Retroshare Webpage&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare&apos;s Forum&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;Retroshare Project Page&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Team Blog&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Dev Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare是一个开源跨平台，&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;私有安全的去中心化交流平台。	&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt; 通过他能安全地跟好友分享 , &lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt; 使用WOT认证节点和OpenSSL进行加密所有的通信。&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare提供文件分享, 聊天, 邮箱和频道&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; 更多信息请看外链:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot; align=&quot;justify&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; font-size:12pt; text-decoration: underline; color:#0000ff;&quot;&gt;RetroShare 主页&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare Wiki&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare 论坛&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare 项目主页&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare 团队博客&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt; text-decoration: underline; color:#0000ff;&quot; align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://retroshare.sourceforge.net&quot;&gt;&lt;span style=&quot; color:#007af4;&quot;&gt;RetroShare 开发组Twitter&lt;/span&gt;&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+37"/>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10913,7 +11952,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation>作者</translation>
     </message>
@@ -10932,7 +11971,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10945,6 +11984,36 @@ 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Website Translators:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare 翻译:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare 网页翻译:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;Swedish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt; Daniel Wester&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;wester@speedmail.se&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;German: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Jan&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;Keller&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt; &amp;lt;&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;trilarion@users.sourceforge.net&lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;&amp;gt;&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;Polish: &lt;/span&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;;&quot;&gt;Maciej Mrug&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="+30"/>
         <source>License Agreement</source>
@@ -11010,12 +12079,12 @@ p, li { white-space: pre-wrap; }
         <translation>表单</translation>
     </message>
     <message>
-        <location line="+123"/>
+        <location line="+121"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copy your RetroShare ID to clipboard&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+158"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11030,7 +12099,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11039,12 +12108,32 @@ p, li { white-space: pre-wrap; }
         <source>This is your Retroshare ID. Copy and share with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Did you receive a certificate from a friend?</source>
+        <translation type="vanished">你收到好友的证书了吗？</translation>
+    </message>
+    <message>
+        <source>Add friends certificate</source>
+        <translation type="vanished">添加好友证书</translation>
+    </message>
+    <message>
+        <source>Add certificate file</source>
+        <translation type="vanished">添加证书文件</translation>
+    </message>
+    <message>
+        <source>Share your RetroShare Key</source>
+        <translation type="vanished">分享你的RetroShare密钥</translation>
+    </message>
     <message>
         <location line="+10"/>
         <location line="+33"/>
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>The text below is your own Retroshare certificate. Send it to your friends</source>
+        <translation type="vanished">下面的文本是你的 RetroShare 证书。把它发送给你的好友</translation>
+    </message>
     <message>
         <location line="+102"/>
         <source>Open Source cross-platform, 
@@ -11055,12 +12144,16 @@ private and secure decentralized communication platform.
 </translation>
     </message>
     <message>
-        <location line="+134"/>
+        <source>Launch startup wizard</source>
+        <translation type="vanished">初次使用向导</translation>
+    </message>
+    <message>
+        <location line="+127"/>
         <source>Open Web Help</source>
         <translation>打开网络帮助</translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation>复制您的证书到剪贴板</translation>
     </message>
@@ -11070,7 +12163,7 @@ private and secure decentralized communication platform.
         <translation>保存您的证书至文件</translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation>通过邮件发送</translation>
     </message>
@@ -11090,37 +12183,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11132,12 +12201,17 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+16"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+57"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11151,6 +12225,10 @@ new short format</source>
         <source>RetroShare Invite</source>
         <translation>RetroShare邀请</translation>
     </message>
+    <message>
+        <source>Your Cert is copied to Clipboard, paste and send it to your friend via email or some other way</source>
+        <translation type="vanished">您的证书已复到剪切板，请将其通过邮件或其他方式粘贴发送给您的好友</translation>
+    </message>
     <message>
         <location line="+19"/>
         <source>Save as...</source>
@@ -11422,14 +12500,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation>信誉</translation>
     </message>
@@ -11439,12 +12517,12 @@ p, li { white-space: pre-wrap; }
         <translation>搜索 </translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation>匿名 ID</translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation>新建身份</translation>
     </message>
@@ -11454,7 +12532,7 @@ p, li { white-space: pre-wrap; }
         <translation>新建圈子</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation>个人</translation>
     </message>
@@ -11469,27 +12547,27 @@ p, li { white-space: pre-wrap; }
         <translation>人物</translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation>屏蔽选项</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation>自动屏蔽掉这个节点签名过的身份</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation>好友点赞</translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation>正面的投票</translation>
     </message>
@@ -11505,39 +12583,29 @@ p, li { white-space: pre-wrap; }
         <translation>负面的投票</translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation>使用统计 </translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation>圈子</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation>圈子名称</translation>
     </message>
@@ -11557,20 +12625,18 @@ p, li { white-space: pre-wrap; }
         <translation>私人圈子</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation>编辑身份</translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation>删除身份</translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation>与此节点聊天</translation>
     </message>
@@ -11580,78 +12646,78 @@ p, li { white-space: pre-wrap; }
         <translation>跟这个节点开启一个远程聊天</translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation>所有者节点名称：</translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation>身份名称</translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation>() </translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation>身份ID</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation>发送消息</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation>身份信息</translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation>身份 ID：</translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation>所有者节点名称：</translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation>创建新的...</translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>类型:</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation>发送邀请</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;关于这个身份，相邻节点的综合评价。 负的是差的，&lt;/p&gt;&lt;p&gt; 正的是好的，零是中立的&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; </translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation>你的评价</translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation>负面的</translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation>中立的</translation>
     </message>
@@ -11662,17 +12728,17 @@ p, li { white-space: pre-wrap; }
         <translation>正面的</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;总体信誉得分，源于你和你的好友&lt;/p&gt;&lt;p&gt; 负的是差的，正的是好的，零是中立的，如果分数太低&lt;/p&gt;&lt;p&gt;这个身份就被标记为差的 , 会被论坛，聊天室频道等&lt;/p&gt;&lt;p&gt;过滤。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation>总体: </translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation>匿名</translation>
     </message>
@@ -11687,24 +12753,24 @@ p, li { white-space: pre-wrap; }
         <translation>搜索 ID</translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation>这个身份被你是拥有者</translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation>我所拥有的身份</translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation>我的通讯录</translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation>显示项目</translation>
     </message>
@@ -11719,12 +12785,7 @@ p, li { white-space: pre-wrap; }
         <translation>链接到我的节点</translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation>其他圈子</translation>
     </message>
@@ -11734,7 +12795,7 @@ p, li { white-space: pre-wrap; }
         <translation>我加入的圈子</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation>圈子ID</translation>
     </message>
@@ -11809,7 +12870,7 @@ p, li { white-space: pre-wrap; }
         <translation>不是会员(无权访问此圈子的数据)</translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation>身份 ID ：</translation>
     </message>
@@ -11839,7 +12900,7 @@ p, li { white-space: pre-wrap; }
         <translation>未知</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation>被邀请</translation>
     </message>
@@ -11854,7 +12915,7 @@ p, li { white-space: pre-wrap; }
         <translation>成员</translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation>编辑圈子</translation>
     </message>
@@ -11902,7 +12963,7 @@ p, li { white-space: pre-wrap; }
         <translation>授予会员资格 </translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11913,7 +12974,7 @@ These identities will soon be not supported anymore.</source>
 此种身份将很快不再被支持。</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation>[未知节点]</translation>
@@ -11956,7 +13017,7 @@ These identities will soon be not supported anymore.</source>
         <translation>匿名身份</translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12036,7 +13097,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12052,12 +13113,25 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <source>Send invite?</source>
+        <translation type="vanished">发送邀请？</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">你真的要以你的证书发送邀请吗 </translation>
+    </message>
+    <message>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation>已屏蔽</translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;身份&lt;/h1&gt;    			&lt;p&gt;身份在此选项卡中，你可以创建/编辑伪匿名身份&lt;b&gt;, 和&lt;b&gt;圈子&lt;/b&gt;。&lt;/b&gt;                			&lt;p&gt;身份&lt;b&gt; 身份用于安全地识别你的数据：为聊天室，论坛和频道文章中的消息签名，				使用 RetroShare 内置电子邮件系统接收反馈，在频道发布文章后				发表评论，使用安全隧道聊天等。&lt;/p&gt; 			&lt;p&gt;身份可任意由&lt;b&gt;你 RetroShare 节点的证书&lt;/b&gt;签名。 			签名的身份更容易信任，但很容易链接到你节点的 IP 地址。&lt;/b&gt;  			&lt;p&gt;&lt;b&gt;匿名身份&lt;/b&gt;允许您与其他用户匿名交互。 他们不能			被欺骗，但是没有人可以证明谁真正拥有一个特定的身份。&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;圈子&lt;/b&gt;是通过网络远程共享的身份(匿名或签名)组，它们可                 		用于限制论坛，频道等的可见性等&lt;p&gt;。&lt;/p&gt;                     一个&lt;b&gt;圈子&lt;/b&gt;可以受限于另一个圈子，从而限制它对该圈子成员的可见性，甚至限制圈子本身的可见性，这意味着只有被邀请的成员可以看到。</translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation>正面的</translation>
     </message>
@@ -12101,11 +13175,19 @@ These identities will soon be not supported anymore.</source>
         <source>Forums</source>
         <translation>论坛</translation>
     </message>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">已发表</translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="vanished">未知</translation>
+    </message>
     <message>
         <location line="+15"/>
         <source>[Unknown]</source>
@@ -12126,6 +13208,14 @@ These identities will soon be not supported anymore.</source>
         <source>Creation of author signature in service %1</source>
         <translation>使用中的作者签名%1</translation>
     </message>
+    <message>
+        <source>Message/vote/comment</source>
+        <translation type="vanished">信息/点赞/评论</translation>
+    </message>
+    <message>
+        <source>%1 in %2 tab</source>
+        <translation type="vanished">%1 在 %2 标签页</translation>
+    </message>
     <message>
         <location line="+38"/>
         <source>Distant message signature validation.</source>
@@ -12146,11 +13236,19 @@ These identities will soon be not supported anymore.</source>
         <source>Signature in distant tunnel system.</source>
         <translation>在远程隧道系统中的签名</translation>
     </message>
+    <message>
+        <source>Update of identity data.</source>
+        <translation type="vanished">更新身份数据。</translation>
+    </message>
     <message>
         <location line="+12"/>
         <source>Generic signature validation.</source>
         <translation>通用签名验证。</translation>
     </message>
+    <message>
+        <source>Generic signature.</source>
+        <translation type="vanished">通用签名。</translation>
+    </message>
     <message>
         <location line="+6"/>
         <source>Generic encryption.</source>
@@ -12162,7 +13260,11 @@ These identities will soon be not supported anymore.</source>
         <translation>通用解密。</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <source>Membership verification in circle %1.</source>
+        <translation type="vanished">圈子%1中的成员验证。</translation>
+    </message>
+    <message>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation>添加到通讯录</translation>
     </message>
@@ -12212,21 +13314,21 @@ These identities will soon be not supported anymore.</source>
         <translation>你好，&lt;br&gt;我想与你成为 RetroShare 上的好友。&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation>人物</translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>你的头像</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation>链接到相邻节点</translation>
     </message>
@@ -12236,7 +13338,7 @@ These identities will soon be not supported anymore.</source>
         <translation>链接到远程节点</translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation>链接到好友的RetroShare节点</translation>
     </message>
@@ -12251,7 +13353,7 @@ These identities will soon be not supported anymore.</source>
         <translation>链接到未知RetroShare节点</translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation>与此人聊天</translation>
     </message>
@@ -12266,12 +13368,12 @@ These identities will soon be not supported anymore.</source>
         <translation>远程聊天拒绝此人</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation>上次使用</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation>+50 已知 PGP</translation>
     </message>
@@ -12291,12 +13393,12 @@ These identities will soon be not supported anymore.</source>
         <translation>你真的要删除这个身份吗？</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation>拥有者</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation>节点名称：</translation>
     </message>
@@ -12306,7 +13408,7 @@ These identities will soon be not supported anymore.</source>
         <translation>节点Id：</translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation>真的要删除？</translation>
     </message>
@@ -12314,7 +13416,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation>昵称</translation>
     </message>
@@ -12344,7 +13446,7 @@ These identities will soon be not supported anymore.</source>
         <translation>笔名</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+131"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+121"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12354,19 +13456,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-34"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-100"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location line="+8"/>
         <source>New identity</source>
         <translation>新建身份</translation>
     </message>
@@ -12380,7 +13475,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12390,12 +13485,7 @@ These identities will soon be not supported anymore.</source>
         <translation>不适用</translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation>编辑身份</translation>
@@ -12406,27 +13496,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">更新</translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12446,7 +13536,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12456,7 +13546,11 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <source>Error getting key!</source>
+        <translation type="vanished">错误：密钥获取出错! </translation>
+    </message>
+    <message>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation>错误：密钥ID无效</translation>
     </message>
@@ -12471,7 +13565,7 @@ These identities will soon be not supported anymore.</source>
         <translation>未知真实姓名***</translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation>创建新身份</translation>
     </message>
@@ -12481,15 +13575,10 @@ These identities will soon be not supported anymore.</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">删除</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12515,7 +13604,7 @@ These identities will soon be not supported anymore.</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished">创建</translation>
     </message>
@@ -12525,13 +13614,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation>你的头像</translation>
     </message>
     <message>
-        <location line="-156"/>
+        <source>Set Avatar</source>
+        <translation type="vanished">设置头像</translation>
+    </message>
+    <message>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation>链接到你的用户档案</translation>
     </message>
@@ -12541,7 +13634,7 @@ These identities will soon be not supported anymore.</source>
         <translation>您可以拥有一个或多个身份。 当您在聊天大厅，论坛和频道中撰写评论时，会使用它们。 它们作为远程聊天和RetroShare远程邮件系统的接收地址。</translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation>63/5000
 昵称太短。 请输入至少%1个字符。</translation>
@@ -12601,6 +13694,10 @@ These identities will soon be not supported anymore.</source>
         <source>PGP name:</source>
         <translation>PGP 用户名</translation>
     </message>
+    <message>
+        <source>GXS id:</source>
+        <translation type="vanished">GXS ID:</translation>
+    </message>
     <message>
         <location line="+8"/>
         <source>PGP id:</source>
@@ -12616,7 +13713,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
@@ -12626,12 +13723,12 @@ These identities will soon be not supported anymore.</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation>标记全部</translation>
     </message>
@@ -12650,38 +13747,26 @@ These identities will soon be not supported anymore.</source>
         <source>Quote</source>
         <translation type="unfinished">引用</translation>
     </message>
+    <message>
+        <source>Send</source>
+        <translation type="vanished">发送</translation>
+    </message>
 </context>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation>保存图像</translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation>无法保存图片，无效的文件名</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation>不是一张图片</translation>
     </message>
@@ -12699,32 +13784,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished">端口:</translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished">状态:</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12745,12 +13825,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12759,31 +13834,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation>打开文件</translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation>打开文件夹</translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation>正在校验...</translation>
     </message>
@@ -12793,7 +13863,7 @@ These identities will soon be not supported anymore.</source>
         <translation>校验文件</translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12821,7 +13891,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation>添加好友</translation>
     </message>
@@ -12837,8 +13907,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>选项</translation>
     </message>
@@ -12859,7 +13928,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation>退出</translation>
     </message>
@@ -12870,12 +13939,12 @@ These identities will soon be not supported anymore.</source>
         <translation>快速入门向导</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation>RetroShare %1 ― 一个分布式安全通信平台</translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation>未完成</translation>
     </message>
@@ -12904,12 +13973,11 @@ RetroShare 将暂停对此目录的访问。
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation>状态</translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation>提示</translation>
     </message>
@@ -12920,35 +13988,31 @@ RetroShare 将暂停对此目录的访问。
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation>打开邮件箱</translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation>带宽图</translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation>应用</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation>最小化</translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation>最大化</translation>
     </message>
@@ -12963,12 +14027,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation>%1 条新消息</translation>
     </message>
@@ -12998,7 +14057,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>%1 个好友已连接</translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation>您确定要退出 RetroShare 吗?</translation>
     </message>
@@ -13018,7 +14077,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>显示</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation>请确认此连接不是伪造，不是指向恶意网站。</translation>
     </message>
@@ -13063,13 +14122,12 @@ RetroShare 将暂停对此目录的访问。
         <translation>服务权限列表</translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation>统计</translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation>显示 Web 界面</translation>
     </message>
@@ -13084,7 +14142,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>目录运行很慢(现在的限制是</translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation>真的要退出吗？</translation>
     </message>
@@ -13093,17 +14151,17 @@ RetroShare 将暂停对此目录的访问。
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation>写信</translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation>联系人</translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation>段落</translation>
     </message>
@@ -13139,12 +14197,12 @@ RetroShare 将暂停对此目录的访问。
         <translation>六级标题</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation>字体大小</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation>增大字号</translation>
     </message>
@@ -13159,32 +14217,32 @@ RetroShare 将暂停对此目录的访问。
         <translation>粗体</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation>斜体</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation>对齐方式</translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation>添加图片</translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation>设置文本为代码样式</translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation>下划线</translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation>主题:</translation>
     </message>
@@ -13195,32 +14253,32 @@ RetroShare 将暂停对此目录的访问。
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation>标签</translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation>地址列表：</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation>推荐这个好友</translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation>设置文本颜色</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation>设置文本背景颜色</translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation>推荐文件</translation>
     </message>
@@ -13290,7 +14348,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>添加大段引用</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation>发送至:</translation>
     </message>
@@ -13314,6 +14372,10 @@ RetroShare 将暂停对此目录的访问。
         <source>&amp;Justify</source>
         <translation>&amp;两端对齐</translation>
     </message>
+    <message>
+        <source>All addresses (mixed)</source>
+        <translation type="vanished">所有地址(混合)</translation>
+    </message>
     <message>
         <location line="+29"/>
         <source>All people</source>
@@ -13325,7 +14387,7 @@ RetroShare 将暂停对此目录的访问。
         <translation>我的通讯录</translation>
     </message>
     <message>
-        <location line="+309"/>
+        <location line="+282"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation>你好,&lt;br&gt;我向你推荐我的一个好友；如果你信任我，也可以信任他们。&lt;br&gt;</translation>
     </message>
@@ -13345,18 +14407,18 @@ RetroShare 将暂停对此目录的访问。
         <translation>希望与您在 RetroShare 上成为好友</translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation>你好 %1,&lt;br&gt;&lt;br&gt;%2 希望加你为 RetroShare 好友。&lt;br&gt;&lt;br&gt;立即回应:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;谢谢,&lt;br&gt; RetroShare 软件小组</translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation>保存邮件</translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation>邮件未发送。
@@ -13368,17 +14430,7 @@ Do you want to save message to draft box?</source>
         <translation>粘贴 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation>添加至&quot;收件人&quot;</translation>
     </message>
@@ -13398,7 +14450,7 @@ Do you want to save message to draft box?</source>
         <translation>添加为推荐</translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation>原始消息</translation>
     </message>
@@ -13408,21 +14460,21 @@ Do you want to save message to draft box?</source>
         <translation>发件人</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation>收件人</translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation>抄送</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation>已发送</translation>
     </message>
@@ -13437,7 +14489,7 @@ Do you want to save message to draft box?</source>
         <translation>%1, %2 写道:</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation>回复:</translation>
     </message>
@@ -13447,30 +14499,30 @@ Do you want to save message to draft box?</source>
         <translation>转发:</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation>您确定要发送无主题的邮件吗?</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation>请输入至少一个收件人。</translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation>密送</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -13585,13 +14637,13 @@ Do you want to save message to draft box?</source>
         <translation>详情</translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation>打开文件...</translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation>HTML 文件 (*.htm *.html);;所有文件 (*)</translation>
     </message>
@@ -13611,7 +14663,7 @@ Do you want to save message to draft box?</source>
         <translation>导出 PDF</translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation>邮件未发送。
@@ -13633,7 +14685,7 @@ Do you want to save message ?</source>
         <translation>添加额外文件</translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation>你好，&lt;br&gt;我想与你成为 RetroShare 上的好友。&lt;br&gt;</translation>
     </message>
@@ -13657,24 +14709,28 @@ Do you want to save message ?</source>
         <source>Warning: This message is too big of %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have a friend invite</source>
+        <translation type="vanished">您有一条好友推荐</translation>
+    </message>
     <message>
         <location line="-37"/>
         <source>Respond now:</source>
         <translation>现在回应:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>发件人:</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2608"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2573"/>
         <source>Friend Nodes</source>
         <translation>好友节点</translation>
     </message>
@@ -13719,13 +14775,13 @@ Do you want to save message ?</source>
         <translation>排序(拉丁字母倒序)</translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation>感谢, &lt;br&gt;</translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation>远程身份</translation>
     </message>
@@ -13735,12 +14791,12 @@ Do you want to save message ?</source>
         <translation>[丢失]</translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation>请创建一个身份以签署远程信息，或从目标列表中删除远处的节点。</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation>节点名和id:</translation>
     </message>
@@ -13818,7 +14874,7 @@ Do you want to save message ?</source>
         <translation>默认</translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation>新标签</translation>
     </message>
@@ -13828,7 +14884,7 @@ Do you want to save message ?</source>
         <translation>新窗口</translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation>标记标签</translation>
     </message>
@@ -13851,7 +14907,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation>主题:</translation>
     </message>
@@ -13859,7 +14915,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation>邮件</translation>
     </message>
@@ -13887,7 +14943,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation>推荐的文件</translation>
     </message>
@@ -13897,37 +14953,37 @@ Do you want to save message ?</source>
         <translation>下载所有推荐文件</translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation>主题:</translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>发件人:</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>收件人:</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation>抄送:</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation>密送:</translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation>标签:</translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished">回复</translation>
     </message>
@@ -13949,7 +15005,7 @@ Do you want to save message ?</source>
     <message>
         <location line="+3"/>
         <source>Forward</source>
-        <translation type="unfinished">前进</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+20"/>
@@ -13967,7 +15023,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation>发送邀请</translation>
     </message>
@@ -14019,7 +15075,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation>确认 %1 为好友</translation>
     </message>
@@ -14029,12 +15085,12 @@ Do you want to save message ?</source>
         <translation>添加 %1 为好友</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation>无主题</translation>
     </message>
@@ -14044,22 +15100,17 @@ Do you want to save message ?</source>
         <translation>下载</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14069,23 +15120,21 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
+        <source>Send invite?</source>
+        <translation type="vanished">发送邀请？</translation>
     </message>
     <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">你真的要以你的证书发送邀请吗 </translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation>下载全部</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation>打印文档</translation>
     </message>
@@ -14100,12 +15149,12 @@ Do you want to save message ?</source>
         <translation>HTML 文件 (*.htm *.html);;所有文件 (*)</translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation>此消息总是载入图像</translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation>隐藏附件窗格 </translation>
     </message>
@@ -14127,6 +15176,42 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation>写信</translation>
     </message>
+    <message>
+        <source>Reply to selected message</source>
+        <translation type="vanished">回复选中的邮件</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">回复</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">回复所选邮件给其中的所有人</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">回复全部</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">转发所选邮件</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="vanished">转发</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">删除所选邮件</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">删除</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">打印所选邮件</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14205,7 +15290,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation>新信息</translation>
     </message>
@@ -14215,16 +15300,60 @@ Do you want to save message ?</source>
         <translation>写信</translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Reply to selected message</source>
+        <translation type="vanished">回复所选邮件</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation type="vanished">回复</translation>
+    </message>
+    <message>
+        <source>Reply all to selected message</source>
+        <translation type="vanished">向选中邮件中的所有人回复邮件</translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="vanished">回复全部</translation>
+    </message>
+    <message>
+        <source>Forward selected message</source>
+        <translation type="vanished">转发所选信息</translation>
+    </message>
+    <message>
+        <source>Foward</source>
+        <translation type="vanished">转发</translation>
+    </message>
+    <message>
+        <source>Remove selected message</source>
+        <translation type="vanished">删除所选消息</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">删除</translation>
+    </message>
+    <message>
+        <source>Print selected message</source>
+        <translation type="vanished">打印所选邮件</translation>
+    </message>
+    <message>
+        <source>Print</source>
+        <translation type="vanished">打印</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation type="vanished">显示</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation>标签</translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation>收件箱</translation>
@@ -14254,17 +15383,21 @@ Do you want to save message ?</source>
         <translation>回收站</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation>收件箱总数:</translation>
     </message>
     <message>
-        <location line="-41"/>
+        <source>Folders</source>
+        <translation type="vanished">文件夹</translation>
+    </message>
+    <message>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation>快捷视图</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation>打印...</translation>
@@ -14274,6 +15407,26 @@ Do you want to save message ?</source>
         <source>Print Preview</source>
         <translation>打印预览</translation>
     </message>
+    <message>
+        <source>Buttons Icon Only</source>
+        <translation type="vanished">按钮显示图标</translation>
+    </message>
+    <message>
+        <source>Buttons Text Beside Icon</source>
+        <translation type="vanished">按钮显示文本和图标</translation>
+    </message>
+    <message>
+        <source>Buttons with Text</source>
+        <translation type="vanished">按钮显示文本</translation>
+    </message>
+    <message>
+        <source>Buttons Text Under Icon</source>
+        <translation type="vanished">按钮文本位于图标下方</translation>
+    </message>
+    <message>
+        <source>Set Text Under Icon</source>
+        <translation type="vanished">文本放置于图标下方</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Save As...</source>
@@ -14295,7 +15448,7 @@ Do you want to save message ?</source>
         <translation>转发信件</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation>主题</translation>
     </message>
@@ -14305,7 +15458,7 @@ Do you want to save message ?</source>
         <translation>发件人</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
@@ -14315,7 +15468,39 @@ Do you want to save message ?</source>
         <translation>内容</translation>
     </message>
     <message>
-        <location line="-4"/>
+        <source>Click to sort by attachments</source>
+        <translation type="vanished">点击按附件排序</translation>
+    </message>
+    <message>
+        <source>Click to sort by subject</source>
+        <translation type="vanished">点击按主题排序</translation>
+    </message>
+    <message>
+        <source>Click to sort by read</source>
+        <translation type="vanished">点击按已读排序</translation>
+    </message>
+    <message>
+        <source>Click to sort by from</source>
+        <translation type="vanished">点击按发件人排序</translation>
+    </message>
+    <message>
+        <source>Click to sort by date</source>
+        <translation type="vanished">点击按日期排序</translation>
+    </message>
+    <message>
+        <source>Click to sort by tags</source>
+        <translation type="vanished">点击按标签排序</translation>
+    </message>
+    <message>
+        <source>Click to sort by star</source>
+        <translation type="vanished">点击按星标排序</translation>
+    </message>
+    <message>
+        <source>Forward selected Message</source>
+        <translation type="vanished">转发所选邮件</translation>
+    </message>
+    <message>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation>搜索主题</translation>
     </message>
@@ -14324,11 +15509,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation>搜索发件人</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14355,14 +15535,14 @@ Do you want to save message ?</source>
         <translation>搜索附件</translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
+        <translation> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;邮件&lt;/h1&gt;                          &lt;p&gt; RetroShare 有自己的内部邮件系统。你可以通过连接的好友节点发送/接收电子邮件。&lt;/p&gt;  &lt;p&gt;也可以使用全球路由系统向其他人的身份发送消息。 这些消息始终被加密和签名，并由中间节点中继，直到它们到达其最终目的地。 &lt;/p&gt;    &lt;p&gt;远程消息保留在发件箱中，直到收到确认。&lt;/p&gt; &lt;p&gt;通常，你可以使用邮件通过粘贴文件链接向好友推荐文件，或者将好友节点推荐给其他的好友节点，来加强你的网络，或向频道所有者发送反馈。&lt;/p&gt;                    </translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
-        <translation type="unfinished"></translation>
+        <translation>加星</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -14436,7 +15616,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14450,7 +15630,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14465,33 +15645,38 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation>草稿箱</translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1463"/>
-        <source>To</source>
-        <translation>收件人</translation>
+        <source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light gray star beside any message.</source>
+        <translation type="vanished">暂无加星邮件。加星令邮件更容易。为邮件加星标，请点击邮件旁的灰色星标。</translation>
     </message>
     <message>
-        <location line="+1160"/>
+        <source>No system messages available.</source>
+        <translation type="vanished">无系统消息。</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="vanished">收件人</translation>
+    </message>
+    <message>
+        <source>Click to sort by to</source>
+        <translation type="vanished">点击按收件人排序</translation>
+    </message>
+    <message>
+        <source>This message goes to a distant person.</source>
+        <translation type="vanished">这条消息发送到了远程用户</translation>
+    </message>
+    <message>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14499,6 +15684,26 @@ Do you want to save message ?</source>
         <source>Total:</source>
         <translation>总计:</translation>
     </message>
+    <message>
+        <source>Messages</source>
+        <translation type="vanished">邮件</translation>
+    </message>
+    <message>
+        <source>Click to sort by signature</source>
+        <translation type="vanished">点击按签名排序</translation>
+    </message>
+    <message>
+        <source>This message was signed and the signature checks</source>
+        <translation type="vanished">此信息已签名，且签名已检查 </translation>
+    </message>
+    <message>
+        <source>This message was signed but the signature doesn&apos;t check</source>
+        <translation type="vanished">此信息已签名，但签名未检查 </translation>
+    </message>
+    <message>
+        <source>This message comes from a distant person.</source>
+        <translation type="vanished">这条消息来自于远程用户</translation>
+    </message>
     <message>
         <location filename="../gui/msgs/MessagesDialog.h" line="+52"/>
         <source>Mail</source>
@@ -14526,17 +15731,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished">保存图像</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation>粘贴纯文本</translation>
     </message>
@@ -14590,7 +15785,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -14600,7 +15795,7 @@ Do you want to save message ?</source>
         <translation>删除项目</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation>来自</translation>
     </message>
@@ -14635,10 +15830,18 @@ Do you want to save message ?</source>
         <translation>待发送消息</translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
+    <message>
+        <source>Send invite?</source>
+        <translation type="vanished">发送邀请？</translation>
+    </message>
+    <message>
+        <source>Do you really want send a invite with your Certificate?</source>
+        <translation type="vanished">你真的要以你的证书发送邀请吗</translation>
+    </message>
 </context>
 <context>
     <name>NATStatus</name>
@@ -14776,7 +15979,7 @@ Do you want to save message ?</source>
         <translation>节点 ID</translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation>移除未使用的密钥...</translation>
     </message>
@@ -14786,7 +15989,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation>清理钥匙环</translation>
     </message>
@@ -14804,13 +16007,7 @@ Notes: Your old keyring will be backed up.
 如果您在同一台电脑上同时运行多个RS实例，清理操作会失败。</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation>钥匙环信息</translation>
@@ -14845,13 +16042,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation>钥匙环中的数据不一致。可能是程序错误。请联系开发人员。</translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation>导出或者新建节点</translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation>仅信任的节点</translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation>搜索名称</translation>
     </message>
@@ -14861,12 +16063,12 @@ For security, your keyring was previously backed-up to file
         <translation>搜索节点 ID</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation>用户详情</translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14875,6 +16077,13 @@ Reported error:</source>
 报告错误：</translation>
     </message>
 </context>
+<context>
+    <name>NetworkPage</name>
+    <message>
+        <source>Network</source>
+        <translation type="vanished">网络</translation>
+    </message>
+</context>
 <context>
     <name>NetworkView</name>
     <message>
@@ -14901,7 +16110,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14922,7 +16131,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished">分组</translation>
     </message>
@@ -14952,19 +16161,19 @@ Reported error:</source>
         <translation type="unfinished">导出你的好友列表包括分组</translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished">ID</translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished">搜索 ID</translation>
     </message>
@@ -14974,12 +16183,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished">显示项目</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14989,7 +16198,7 @@ Reported error:</source>
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished">分组</translation>
     </message>
@@ -15104,7 +16313,7 @@ Reported error:</source>
         <translation type="unfinished">全部折叠</translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished">你想移除这个节点吗</translation>
     </message>
@@ -15114,7 +16323,7 @@ Reported error:</source>
         <translation type="unfinished">您是否要删除此好友?</translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished">完成！</translation>
@@ -15226,7 +16435,11 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <source>Log entries</source>
+        <translation type="vanished">日志条目</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15241,7 +16454,11 @@ at least one peer was not added to a group</source>
         <translation>删除全部</translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <source>This is a test.</source>
+        <translation type="vanished">这是一个测试。</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation>新的在上面</translation>
     </message>
@@ -15251,12 +16468,27 @@ at least one peer was not added to a group</source>
         <translation>旧的在上面</translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;News Feed&lt;/h1&gt;                                                             &lt;p&gt;The Log Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel and Forum posts&lt;/li&gt;                                                                               &lt;li&gt;New Channels and Forums you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;事件中心&lt;/h1&gt;
+&lt;p&gt;事件中心显示网络上最近的事件，按您收到的时间排序。
+它为您提供了一份好友活动摘要。您可以点击&lt;b&gt;选项&lt;/b&gt;设置要显示的事件。&lt;/p&gt;
+&lt;p&gt;可显示的各种事件包括：
+&lt;ul&gt;&lt;li&gt;连接尝试(有助于结识新朋友，控制与您的连接)&lt;/li&gt;
+&lt;li&gt;频道/论坛消息&lt;/li&gt;
+&lt;li&gt;可订阅的新频道/论坛&lt;/li&gt;
+&lt;li&gt;好友发送的私人消息&lt;/li&gt;&lt;/ul&gt; &lt;/p&gt;                                                                                                       </translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="vanished">日志</translation>
+    </message>
+    <message>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15311,6 +16543,10 @@ at least one peer was not added to a group</source>
         <source>Blogs</source>
         <translation>博客</translation>
     </message>
+    <message>
+        <source>Security</source>
+        <translation type="vanished">安全</translation>
+    </message>
     <message>
         <location line="+42"/>
         <location line="+253"/>
@@ -15332,6 +16568,10 @@ at least one peer was not added to a group</source>
         <source>Message</source>
         <translation>邮件</translation>
     </message>
+    <message>
+        <source>Connect attempt</source>
+        <translation type="vanished">连接尝试</translation>
+    </message>
     <message>
         <location line="+30"/>
         <location line="+19"/>
@@ -15348,6 +16588,10 @@ at least one peer was not added to a group</source>
         <source>Ip security</source>
         <translation>IP安全</translation>
     </message>
+    <message>
+        <source>Log</source>
+        <translation type="obsolete">日志</translation>
+    </message>
     <message>
         <location line="-63"/>
         <source>Friend Connected</source>
@@ -15358,6 +16602,10 @@ at least one peer was not added to a group</source>
         <source>Circles</source>
         <translation type="unfinished">圈子</translation>
     </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">链接</translation>
+    </message>
     <message>
         <location line="-36"/>
         <source>Activity</source>
@@ -15410,6 +16658,14 @@ at least one peer was not added to a group</source>
         <source>Chat rooms</source>
         <translation>聊天室</translation>
     </message>
+    <message>
+        <source>Chat Rooms</source>
+        <translation type="vanished">聊天室</translation>
+    </message>
+    <message>
+        <source>Case sensitive</source>
+        <translation type="vanished">区分大小写</translation>
+    </message>
     <message>
         <location line="-127"/>
         <source>Position</source>
@@ -15485,16 +16741,24 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation>临时禁用所有弹出消息</translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">日志订阅</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
         <translation>系统托盘</translation>
     </message>
+    <message>
+        <source>Count all unread messages</source>
+        <translation type="vanished">计数所有未读信息</translation>
+    </message>
 </context>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation>需要密码</translation>
     </message>
@@ -15514,12 +16778,12 @@ at least one peer was not added to a group</source>
         <translation>密码错误! </translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation>请输入您的RetroShare密码</translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation>未注册插件/可执行程序</translation>
     </message>
@@ -15534,7 +16798,19 @@ at least one peer was not added to a group</source>
         <translation>请检查您的系统时钟。</translation>
     </message>
     <message>
-        <location line="+440"/>
+        <source>Examining shared files...</source>
+        <translation type="vanished">正在检查共享文件...</translation>
+    </message>
+    <message>
+        <source>Hashing file</source>
+        <translation type="vanished">正在计算文件的校验散列值</translation>
+    </message>
+    <message>
+        <source>Saving file index...</source>
+        <translation type="vanished">正在保存文件索引...</translation>
+    </message>
+    <message>
+        <location line="+452"/>
         <source>Test</source>
         <translation>测试</translation>
     </message>
@@ -15545,19 +16821,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation>未知标题</translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation>加密消息</translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation>为了正常使用聊天大厅，您的电脑时间一定要正确。如果出现下面状况请检查时间(侦测到您与好友之间可能存在几分钟的时间偏差)。</translation>
     </message>
@@ -15565,7 +16839,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation>好友在线</translation>
     </message>
@@ -15617,6 +16891,10 @@ at least one peer was not added to a group</source>
 </context>
 <context>
     <name>PGPKeyDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="vanished">对话</translation>
+    </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="+61"/>
         <source>Profile info</source>
@@ -15682,6 +16960,10 @@ at least one peer was not added to a group</source>
         <source>This profile has signed your own profile key</source>
         <translation>节点是否对我的PGP密钥签名</translation>
     </message>
+    <message>
+        <source>Key signatures :</source>
+        <translation type="vanished">密钥签名。</translation>
+    </message>
     <message>
         <location line="-15"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15711,20 +16993,23 @@ p, li { white-space: pre-wrap; }
         <translation>PGP 密钥</translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation>这些选项将应用到这个用户的所有节点</translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;签署好友的钥匙是表达你对这个好友，给你的其他好友的信任的一种方式。 它可以帮助他们决定是否允许基于您自己的信任的密钥进行连接。 签署密钥是绝对可选的，不能撤销，所以请做出明智的选择.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-223"/>
         <source>Keysigning:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sign PGP key</source>
+        <translation type="vanished">签署PGP密钥</translation>
+    </message>
     <message>
         <location line="+78"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here if you want to refuse connections to nodes authenticated by this key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -15761,7 +17046,12 @@ p, li { white-space: pre-wrap; }
         <translation>包含签名</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation>选项</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;RetroShare会定期检查您的好友列表中的可浏览文件与您的传输匹配，以建立直接传输。 在这种情况下，您的好友知道您正在下载文件.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;要防止此行为（仅适用于此好友），请取消选中此框。 如果您明确要求，您仍然可以执行直接传输。 从你好友的文件列表下载。 此设置应用于同一节点的所有位置.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -15775,6 +17065,10 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option allows you to automatically download a file that is recommended in an message coming from this node. This can be used for instance to send files between your own nodes. Applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt; &lt;head /&gt; &lt;body&gt; &lt;p&gt;此选项允许您自动下载来自此节点的消息中推荐的文件。 这可以用于例如在您自己的节点之间发送文件。 应用于同一节点的所有位置。&lt;/ p&gt; &lt;/ body&gt; &lt;/ html&gt;</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Auto-download recommended files from this node</source>
@@ -15807,21 +17101,21 @@ p, li { white-space: pre-wrap; }
         <translation>kB/s</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation>RetroShare</translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation>错误：无法获取节点详情。</translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation>RetroShare 不支持此密钥算法
@@ -15842,7 +17136,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 警告:你在文件传输选项中关闭了直接下载。</translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation>信任级别是表达您对此密钥的信任的一种方式。 它不被软件使用，也不是共享的，仅用于方便记住好/坏的密钥。</translation>
     </message>
@@ -15911,6 +17205,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Check the password!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Maybe password is wrong</source>
+        <translation type="vanished">密码可能不对</translation>
+    </message>
     <message>
         <location line="-136"/>
         <source>You haven&apos;t set a trust level for this key.</source>
@@ -15918,12 +17216,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation>RetroShare用户档案</translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation>这是你的密钥，签名人是：</translation>
     </message>
@@ -15949,7 +17247,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
@@ -15970,7 +17268,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>删除项目</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
@@ -16010,7 +17308,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation>撰写消息</translation>
     </message>
@@ -16024,6 +17322,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Friend Connected</source>
         <translation>好友已连接</translation>
     </message>
+    <message>
+        <source>Connect Attempt</source>
+        <translation type="vanished">连接尝试</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>Connection refused by peer</source>
@@ -16062,13 +17364,17 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
+    <message>
+        <source>Unknown Peer</source>
+        <translation type="vanished">未知节点</translation>
+    </message>
     <message>
         <location line="+106"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation>发送消息</translation>
     </message>
@@ -16120,6 +17426,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>Chat with this person as...</source>
         <translation>跟这个人聊天以 </translation>
     </message>
+    <message>
+        <source>Send message to this person</source>
+        <translation type="vanished">给这个人发送信息</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Invite to Circle</source>
@@ -16178,6 +17488,10 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Anyone in your contact list will automatically have a positive opinion if not set. This allows to automatically raise reputations of used nodes. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; 如果没有设置你通讯录里的所有人都会自动获的正面的评价，这将自动增长使用过的节点的信誉点 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
+    <message>
+        <source>automatically give &quot;Positive&quot; opinion to my contacts</source>
+        <translation type="vanished">给我的联系人自动给出正面的评价</translation>
+    </message>
     <message>
         <location line="+3"/>
         <source>use &quot;positive&quot; as the default opinion for contacts (instead of neutral)</source>
@@ -16235,6 +17549,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;为防止已删除的被屏蔽 ID 因为在论坛或频道中使用而被拒绝，被禁止的身份将被保留在列表中，一段时间后，它们会被从禁止列表中&quot;清除&quot; ，如果在论坛、聊天室等中使用，将会重新作为未被屏蔽的 ID 被下载。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">表格</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16242,11 +17563,23 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>PhotoShare</source>
         <translation>照片共享</translation>
     </message>
+    <message>
+        <source>Photo</source>
+        <translation type="vanished">照片</translation>
+    </message>
     <message>
         <location line="+86"/>
         <source>TextLabel</source>
         <translation>文字标签</translation>
     </message>
+    <message>
+        <source>Comment</source>
+        <translation type="vanished">评论</translation>
+    </message>
+    <message>
+        <source>Summary</source>
+        <translation type="vanished">概述</translation>
+    </message>
     <message>
         <location line="-52"/>
         <source>Album / Photo Name</source>
@@ -16307,6 +17640,14 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <source>...</source>
         <translation>...</translation>
     </message>
+    <message>
+        <source>Add Comment</source>
+        <translation type="vanished">添加评论</translation>
+    </message>
+    <message>
+        <source>Write a comment...</source>
+        <translation type="vanished">写评论...</translation>
+    </message>
     <message>
         <location filename="../gui/PhotoShare/PhotoDialog.cpp" line="+76"/>
         <source>Album</source>
@@ -16377,6 +17718,10 @@ p, li { white-space: pre-wrap; }
         <source>Create Album</source>
         <translation>创建相册</translation>
     </message>
+    <message>
+        <source>View Album</source>
+        <translation type="vanished">浏览相册</translation>
+    </message>
     <message>
         <location line="+23"/>
         <source>Edit Album Details</source>
@@ -16398,17 +17743,17 @@ p, li { white-space: pre-wrap; }
         <translation>幻灯片放映</translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation>我的相册</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation>已订阅相册</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation>已分享相册</translation>
     </message>
@@ -16437,7 +17782,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation>相册名称</translation>
     </message>
@@ -16496,19 +17841,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16544,12 +17889,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation>文本标签</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation>显示此插件的更多详情</translation>
     </message>
@@ -16695,6 +18040,60 @@ p, li { white-space：pre-wrap；}
         <source>Plugin look-up directories</source>
         <translation>插件查找目录</translation>
     </message>
+    <message>
+        <source>Plugin disabled. Click the enable button and restart Retroshare</source>
+        <translation type="vanished">插件已禁用，点击启用按钮重启 RetroShare 后启用。</translation>
+    </message>
+    <message>
+        <source>[disabled]</source>
+        <translation type="vanished">[禁用]</translation>
+    </message>
+    <message>
+        <source>No API number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">未提供 API 版本，请阅读插件开发手册。</translation>
+    </message>
+    <message>
+        <source>[loading problem]</source>
+        <translation type="vanished">[加载问题]</translation>
+    </message>
+    <message>
+        <source>No SVN number supplied. Please read plugin development manual.</source>
+        <translation type="vanished">未提供 SVN 版本。请阅读插件开发手册。</translation>
+    </message>
+    <message>
+        <source>Loading error.</source>
+        <translation type="vanished">载入错误。</translation>
+    </message>
+    <message>
+        <source>Missing symbol. Wrong version?</source>
+        <translation type="vanished">缺少符号,版本错误?</translation>
+    </message>
+    <message>
+        <source>No plugin object</source>
+        <translation type="vanished">无插件对象</translation>
+    </message>
+    <message>
+        <source>Plugins is loaded.</source>
+        <translation type="vanished">插件已载入。</translation>
+    </message>
+    <message>
+        <source>Unknown status.</source>
+        <translation type="vanished">未知状态。</translation>
+    </message>
+    <message>
+        <source>Check this for developing plugins. They will not
+be checked for the hash. However, in normal
+times, checking the hash protects you from
+malicious behavior of crafted plugins.</source>
+        <translation type="vanished">开发插件可选此项。不再校验插件的散列值。
+然而，通常情况下校验插件散列值可以保护您
+远离被修改的有害插件。
+</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Plugins&lt;/h1&gt;                   &lt;p&gt;Plugins are loaded from the directories listed in the bottom list.&lt;/p&gt;                       &lt;p&gt;For security reasons, accepted plugins load automatically until                              the main Retroshare executable or the plugin library changes. In                                such a case, the user needs to confirm them again.                                              After the program is started, you can enable a plugin manually by clicking on the               &quot;Enable&quot; button and then restart Retroshare.&lt;/p&gt;                                              &lt;p&gt;If you want to develop your own plugins, contact the developpers team                        they will be happy to help you out!&lt;/p&gt;</source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;插件&lt;/h1&gt;                   &lt;p&gt;插件从下列列表中目录中加载。&lt;/p&gt;                       &lt;p&gt; 由于安全原因，接受的插件自动加载                              直到主RetroShare可执行文件或插件库更改。 在                                这种情况下，用户需要再次确认。                                               程序启动后，您可以通过单击“启用”按钮手动启用插件，               然后重新启动RetroShare。&lt;/p&gt;                                              &lt;p&gt;如果要开发自己的插件，请联系开发人员团队，                       他们将乐意帮助您!&lt;/p&gt;</translation>
+    </message>
     <message>
         <location line="-64"/>
         <source>Plugins</source>
@@ -16764,27 +18163,12 @@ p, li { white-space：pre-wrap；}
         <translation>设置装口置顶</translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished">屏蔽这个人 (给出负面评价)</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished">给出中立评价</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished">给出正面评价</translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16818,6 +18202,14 @@ p, li { white-space：pre-wrap；}
         <source>Close conversation?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Closing this window will end the conversation, notify the peer and remove the encrypted tunnel.</source>
+        <translation type="vanished">关闭此窗口将结束会话，同时通知对方节点终止加密聊天通道。</translation>
+    </message>
+    <message>
+        <source>Kill the tunnel?</source>
+        <translation type="vanished">终止隧道?</translation>
+    </message>
 </context>
 <context>
     <name>PostedCardView</name>
@@ -16837,7 +18229,7 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished">赞</translation>
     </message>
@@ -16857,8 +18249,8 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished">\/</translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16883,13 +18275,13 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16917,12 +18309,20 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <source>Signed by: </source>
+        <translation type="vanished">签名者：</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="vanished">备注</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation>RetroShare </translation>
     </message>
@@ -16937,22 +18337,12 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished">载入图片文件</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16968,17 +18358,7 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16988,7 +18368,23 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Submit Post</source>
+        <translation type="vanished">提交贴文</translation>
+    </message>
+    <message>
+        <source>You are submitting a link. The key to a successful submission is interesting content and a descriptive title.</source>
+        <translation type="vanished">您正在提交一个链接。 成功提交的关键是有趣的内容和描述性标题。</translation>
+    </message>
+    <message>
+        <source>Submit</source>
+        <translation type="vanished">提交</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">提交新贴文 </translation>
+    </message>
+    <message>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation>请添加标题</translation>
     </message>
@@ -17008,22 +18404,12 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17038,7 +18424,7 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished">发表</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -17049,7 +18435,7 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished">图像</translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17059,7 +18445,7 @@ p, li { white-space：pre-wrap；}
         <translation>标题</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation>链接:</translation>
     </message>
@@ -17067,12 +18453,44 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <source>Posted Links</source>
+        <translation type="vanished">发布链接</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Posted&lt;/h1&gt;        &lt;p&gt;The posted service allows you to share internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Links can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Posted links are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;已发表&lt;/h1&gt;        &lt;p&gt;已发表服务允许你共享互联网链接，这些链接在 RetroShare 节点，如论坛和	 频道中传播&lt;/p&gt; 	 &lt;p&gt;链接可以被订阅的用户评论。 推广系统也给机会	 推荐重要的链接。&lt;/p&gt;      &lt;p&gt;链接被共享时没有限制。 点击它们时要小心。&lt;/p&gt;    &lt;p&gt;发布的链接保留%1天，并且会同步最近%2天的内容，除非你更改此设置。&lt;/p&gt;                </translation>
+    </message>
+    <message>
+        <source>Create Topic</source>
+        <translation type="vanished">创建话题</translation>
+    </message>
+    <message>
+        <source>My Topics</source>
+        <translation type="vanished">我的主题</translation>
+    </message>
+    <message>
+        <source>Subscribed Topics</source>
+        <translation type="vanished">订阅的主题</translation>
+    </message>
+    <message>
+        <source>Popular Topics</source>
+        <translation type="vanished">活跃主题</translation>
+    </message>
+    <message>
+        <source>Other Topics</source>
+        <translation type="vanished">其它主题</translation>
+    </message>
+    <message>
+        <source>Links</source>
+        <translation type="vanished">链接:</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17106,7 +18524,31 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <source>Posted Topic</source>
+        <translation type="vanished">已发表主题</translation>
+    </message>
+    <message>
+        <source>Add Topic Admins</source>
+        <translation type="vanished">添加主题管理员</translation>
+    </message>
+    <message>
+        <source>Select Topic Admins</source>
+        <translation type="vanished">选择主题管理员</translation>
+    </message>
+    <message>
+        <source>Create New Topic</source>
+        <translation type="vanished">创建新话题</translation>
+    </message>
+    <message>
+        <source>Edit Topic</source>
+        <translation type="vanished">编辑话题</translation>
+    </message>
+    <message>
+        <source>Update Topic</source>
+        <translation type="vanished">更新主题</translation>
+    </message>
+    <message>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17144,17 +18586,7 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation>订阅已发布的</translation>
     </message>
@@ -17170,7 +18602,7 @@ p, li { white-space：pre-wrap；}
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -17185,17 +18617,24 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <source>Posted Description</source>
+        <translation type="vanished">贴文描述</translation>
+    </message>
+    <message>
+        <source>Loading</source>
+        <translation type="vanished">正在载入</translation>
+    </message>
+    <message>
+        <source>New Posted</source>
+        <translation type="vanished">新建贴文</translation>
+    </message>
+    <message>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished">从不</translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17208,18 +18647,22 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <source>Site</source>
+        <translation type="vanished">站点</translation>
+    </message>
+    <message>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation>注释</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17230,12 +18673,12 @@ p, li { white-space：pre-wrap；}
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation>评论</translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17245,7 +18688,7 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished">&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;此消息的作者(ID为%1)被禁止。&lt;/b&gt;</translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17255,17 +18698,21 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished">隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation>赞</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation>踩</translation>
     </message>
     <message>
-        <location line="+431"/>
+        <source>\/</source>
+        <translation type="vanished">\/</translation>
+    </message>
+    <message>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>设置为已读并删除条目</translation>
     </message>
@@ -17275,7 +18722,7 @@ p, li { white-space：pre-wrap；}
         <translation>新</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation>新评论：</translation>
     </message>
@@ -17285,7 +18732,7 @@ p, li { white-space：pre-wrap；}
         <translation>评论值</translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17326,10 +18773,77 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation>正在载入</translation>
     </message>
+    <message>
+        <source>By</source>
+        <translation type="vanished">作者</translation>
+    </message>
+</context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">表单</translation>
+    </message>
+    <message>
+        <source>Hot</source>
+        <translation type="vanished">人气</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">新</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="vanished">排名</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">今天</translation>
+    </message>
+    <message>
+        <source>Yesterday</source>
+        <translation type="vanished">昨天</translation>
+    </message>
+    <message>
+        <source>This Week</source>
+        <translation type="vanished">本周</translation>
+    </message>
+    <message>
+        <source>This Month</source>
+        <translation type="vanished">本月</translation>
+    </message>
+    <message>
+        <source>This Year</source>
+        <translation type="vanished">今年</translation>
+    </message>
+    <message>
+        <source>Submit a new Post</source>
+        <translation type="vanished">提交新贴文</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">下一条</translation>
+    </message>
+    <message>
+        <source>RetroShare</source>
+        <translation type="vanished">RetroShare</translation>
+    </message>
+    <message>
+        <source>Please create or choose a Signing Id before Voting</source>
+        <translation type="vanished">投票前请选择您的签名ID</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">上一条</translation>
+    </message>
+    <message>
+        <source>1-10</source>
+        <translation type="vanished">1-10</translation>
+    </message>
 </context>
 <context>
     <name>PostedListWidgetWithModel</name>
@@ -17349,17 +18863,7 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished">0</translation>
     </message>
@@ -17369,15 +18873,15 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished">管理员：</translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished">传播范围</translation>
     </message>
@@ -17387,42 +18891,42 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished">贴文</translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17439,10 +18943,10 @@ p, li { white-space：pre-wrap；}
     <message>
         <location line="+9"/>
         <source>Hot</source>
-        <translation type="unfinished">热门</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17472,17 +18976,17 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17497,17 +19001,12 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17517,31 +19016,27 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished">编辑</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17556,7 +19051,7 @@ p, li { white-space：pre-wrap；}
         <translation type="unfinished">订阅</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished">从不</translation>
     </message>
@@ -17608,17 +19103,17 @@ p, li { white-space：pre-wrap；}
     <message>
         <location line="+9"/>
         <source>Restricted to members of circle &quot;</source>
-        <translation type="unfinished">仅限于圈子的成员&quot;</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Restricted to members of circle </source>
-        <translation type="unfinished">仅限于圈子的成员 </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Your eyes only</source>
-        <translation type="unfinished">只有你能看见 </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
@@ -17630,16 +19125,6 @@ p, li { white-space：pre-wrap；}
         <source>No Channel Selected</source>
         <translation type="unfinished">未选择频道! </translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17648,6 +19133,10 @@ p, li { white-space：pre-wrap；}
         <source>Tabs</source>
         <translation>标签</translation>
     </message>
+    <message>
+        <source>Open each topic in a new tab</source>
+        <translation type="vanished">在新标签页打开每个话题</translation>
+    </message>
     <message>
         <location filename="../gui/settings/PostedPage.cpp" line="+33"/>
         <source>Open each board in a new tab</source>
@@ -17661,6 +19150,10 @@ p, li { white-space：pre-wrap；}
 </context>
 <context>
     <name>PostedUserNotify</name>
+    <message>
+        <source>Posted</source>
+        <translation type="vanished">已发表</translation>
+    </message>
     <message>
         <location filename="../gui/Posted/PostedUserNotify.cpp" line="+33"/>
         <source>Board Post</source>
@@ -17729,16 +19222,16 @@ p, li { white-space：pre-wrap；}
         <translation>用户档案管理器</translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17850,7 +19343,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation>编辑状态消息</translation>
@@ -17866,7 +19359,7 @@ and use the import button to load it</source>
         <translation>用户档案管理器</translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation>公开信息</translation>
     </message>
@@ -17901,12 +19394,12 @@ and use the import button to load it</source>
         <translation>在线始于:</translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation>其它信息</translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation>我的地址</translation>
     </message>
@@ -17950,27 +19443,51 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <source>Post From:</source>
+        <translation type="vanished">贴文来自：</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">账户1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">账户2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">账户3</translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation>添加至 Pulse</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <source>filter</source>
+        <translation type="vanished">过滤</translation>
+    </message>
+    <message>
+        <source>URL Adder</source>
+        <translation type="vanished">URL 添加</translation>
+    </message>
+    <message>
+        <location line="+7"/>
         <source>Display As</source>
         <translation>显示为</translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17980,12 +19497,12 @@ and use the import button to load it</source>
         <translation type="unfinished">发件人:</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18015,13 +19532,13 @@ and use the import button to load it</source>
         <translation type="unfinished">负面的</translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -18033,22 +19550,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -18057,13 +19564,17 @@ and use the import button to load it</source>
         <source>Cancel</source>
         <translation>取消 </translation>
     </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">向wire发刺探包</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/PulseAddDialog.cpp" line="-22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18078,24 +19589,34 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished">载入图片文件</translation>
+        <source>From</source>
+        <translation type="vanished">发信人</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">日期</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18106,7 +19627,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18125,7 +19646,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18135,7 +19656,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18162,7 +19683,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18172,7 +19693,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18192,7 +19713,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18308,7 +19829,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18316,42 +19837,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18383,7 +19899,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18391,8 +19907,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation>确认</translation>
     </message>
@@ -18661,12 +20177,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>节点详情</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation>文件请求已取消</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation>此版本的 RetroShare 正在使用 OpenPGP-SDK。因此没有使用系统中的共享PGP钥匙环，而是自有钥匙环，在所有RetroShare实例间共享。&lt;br&gt;&lt;br&gt;
 您似乎没有这种钥匙环，尽管现有 RetroShare 账户中引用了PGP密钥，也许您刚刚才升级至此新版本。</translation>
@@ -18701,7 +20217,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation>发生意外错误。请报告错误&apos;RsInit::InitRetroShare unexpected return code %1&apos;。</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18735,7 +20251,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation>多实例运行</translation>
@@ -18758,26 +20274,6 @@ The error reported is:&quot;</source>
  Lock 文件:
 </translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18860,7 +20356,7 @@ Reported error is:
         <translation>数据转发</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation>您似乎有与DSA密钥关联的节点： </translation>
     </message>
@@ -18870,7 +20366,7 @@ Reported error is:
         <translation>当前 RetroShare 的版本不支持 DSA 密钥。所有这些地点都将无法使用。我们很抱歉会这样。</translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation>启用</translation>
     </message>
@@ -18880,7 +20376,7 @@ Reported error is:
         <translation>禁用</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation>添加%1至白名单</translation>
     </message>
@@ -18896,7 +20392,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation>%1 秒前</translation>
     </message>
@@ -18964,7 +20460,7 @@ Security: no anonymous IDs</source>
 安全:没有匿名ID</translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation>加入聊天室</translation>
     </message>
@@ -18993,7 +20489,7 @@ Security: no anonymous IDs</source>
         <translation>无法解析XML文件！</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation>无限期 </translation>
     </message>
@@ -19173,29 +20669,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished">节点</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished">地址</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished">状态</translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19388,6 +20868,10 @@ Security: no anonymous IDs</source>
         <source>Click to resume the hashing process</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;This certificate contains:</source>
+        <translation type="obsolete">&lt;p&gt;此证书包含：</translation>
+    </message>
     <message>
         <location filename="../gui/statistics/TurtleRouterDialog.cpp" line="-44"/>
         <source>Idle</source>
@@ -19438,18 +20922,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19612,7 +21084,7 @@ p, li { white-space：pre-wrap；}
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation>全网匿名可见</translation>
     </message>
@@ -19795,7 +21267,7 @@ p, li { white-space：pre-wrap；}
         <translation>表单</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation>已阻止内置图像加载</translation>
     </message>
@@ -19808,7 +21280,7 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation>默认允许</translation>
     </message>
@@ -19981,22 +21453,12 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished">保存图像</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20004,12 +21466,12 @@ p, li { white-space：pre-wrap；}
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation>树状视图选项</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20039,6 +21501,14 @@ p, li { white-space：pre-wrap；}
         <source>Show column …</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show column...</source>
+        <translation type="vanished">显示列</translation>
+    </message>
+    <message>
+        <source>[no title]</source>
+        <translation type="vanished">[无标题]</translation>
+    </message>
 </context>
 <context>
     <name>RatesStatus</name>
@@ -20701,7 +22171,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20822,7 +22292,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20842,7 +22312,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished">IP</translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20900,7 +22370,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished">信息将被转发给你的好友</translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished">[ ... 丢失消息 ... ]</translation>
     </message>
@@ -20914,6 +22384,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished">[未知]</translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished">[ ... 丢失消息 ... ]</translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20927,11 +22402,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20954,18 +22424,13 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by read</source>
+        <translation type="unfinished">点击按已读排序</translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
-        <translation type="unfinished"></translation>
+        <source>Click to sort by from</source>
+        <translation type="unfinished">点击按发件人排序</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -20988,9 +22453,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21011,7 +22474,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation>重设所有保存的RetroShare设置。</translation>
     </message>
@@ -21072,7 +22535,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>设置RetroShare语言</translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>无法打开日志文件 &quot;%1&apos;:%2</translation>
     </message>
@@ -21093,7 +22556,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation>无法创建目录:%1</translation>
     </message>
     <message>
-        <location line="-425"/>
+        <source>Revision</source>
+        <translation type="vanished">Revision</translation>
+    </message>
+    <message>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21123,7 +22590,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation>指定的语言代码无效: </translation>
     </message>
@@ -21141,7 +22608,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation>注册表访问错误。也许你需要管理员权限。 </translation>
@@ -21158,12 +22625,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation>在此输入关键词(至少3个字符长)</translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation>开始搜索</translation>
     </message>
@@ -21225,7 +22692,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation>关键词</translation>
     </message>
@@ -21240,7 +22707,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>搜索 ID</translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation>文件名</translation>
     </message>
@@ -21340,23 +22807,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation>下载所选项目</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation>文件名称</translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>下载</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation>复制 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation>发送 RetroShare 链接</translation>
     </message>
@@ -21366,7 +22833,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>下载提示</translation>
     </message>
@@ -21403,7 +22870,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>删除全部</translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>文件夹</translation>
@@ -21414,17 +22881,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation>新建 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation>打开文件夹</translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation>创建资源集合</translation>
     </message>
@@ -21444,7 +22911,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>从集合文件中下载...</translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation>资源集合</translation>
     </message>
@@ -21452,7 +22919,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation>节点详情</translation>
     </message>
@@ -21468,22 +22935,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>删除条目</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation>IP 地址：</translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation>节点 ID</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation>节点名称</translation>
     </message>
@@ -21500,7 +22967,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>隐藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation>已报告</translation>
     </message>
@@ -21525,8 +22992,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation>&lt;p&gt;这是你的好友声称他连接到的IP。 如果你刚改变IP，这是只是一个错误警告。 如果没有，那意味着你与这个好友的连接是由一个中间的节点转发的，这是可疑的。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这个警告是为了保护你免受流量转发攻击。在这种情况下，你连接的好友不会看到你的外部 IP，而会看到攻击者的 IP。&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;但是，如果你只是因为某些原因(某些ISP经常强制更改IP)而更改了 IP，则此警告只会告诉你在 RetroShare 得知 IP 更改之前连接到新 IP 的好友。这种情况是正常的。&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;可以通过将你自己的 IP (例如你的 ISP 的范围)列入白名单，或通过在“选项” -&gt; “通知” -&gt;“事件中心”中完全禁用这些警告来简单地禁止虚假警告。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -21534,7 +23001,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation>希望成为您的 RetroShare 好友</translation>
     </message>
@@ -21565,7 +23032,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>展开</translation>
     </message>
@@ -21610,12 +23077,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>状态:</translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation>写邮件</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation>连接尝试</translation>
     </message>
@@ -21635,22 +23102,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation>未知(出站)连接企图</translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation>未知安全问题</translation>
     </message>
     <message>
-        <location line="+68"/>
-        <source>SSL request</source>
+        <location line="+42"/>
+        <source>A unknown peer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-31"/>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
@@ -21660,7 +23122,11 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <source>Unknown Peer</source>
+        <translation type="vanished">未知节点</translation>
+    </message>
+    <message>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>隐藏</translation>
     </message>
@@ -21670,7 +23136,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>您是否要删除此好友?</translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation>证书有错误的签名！ 这个节点不是他自称的那样。</translation>
     </message>
@@ -21680,12 +23146,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation>丢失/损坏的证书 。不是一个真是RetroShare用户</translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation>证书导致了一个内部错误。</translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation>节点不在好友列表里(PGP ID=</translation>
     </message>
@@ -21744,12 +23210,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation>本地地址</translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21770,22 +23236,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>端口:</translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation>本地网络</translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation>公网 IP 探测服务</translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation>已知/先前的 IP</translation>
     </message>
@@ -21801,16 +23267,21 @@ behind a firewall or a VPN.</source>
 下连接的情况。</translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation>允许 RetroShare 通过如下网站确定外网IP:</translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation>kB/s</translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation>可接受的端口范围从 10 到 65535 。正常情况下低于 1024 的端口被你的系统保留。</translation>
     </message>
@@ -21820,46 +23291,23 @@ behind a firewall or a VPN.</source>
         <translation>可接受的端口范围从 10 到 65535 。正常情况下低于 1024 的端口被你的系统保留。</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation>隐藏地址</translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation>节点探索开启(推荐)</translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation>节点探索关闭</translation>
     </message>
@@ -21869,7 +23317,7 @@ List of found external IP:
         <translation>隐藏 - 查看配置</translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation>I2P 地址</translation>
     </message>
@@ -21894,95 +23342,37 @@ List of found external IP:
         <translation>传入正常</translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation>代理看起来正常工作</translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation>I2P 代理没有启用</translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation>客户端</translation>
     </message>
@@ -21997,7 +23387,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation>未知</translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation>检查连接</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation>正在生成密钥</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation>启动中</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation>关闭中</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22007,7 +23461,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation>通过隐藏服务对你可达</translation>
     </message>
@@ -22021,12 +23490,12 @@ Also check your ports!</source>
 另外请检查您的端口！</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation>[隐身模式]</translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这将清除已知地址列表。 如果由于某些原因您的地址列表包含无效/不相关/过期的地址，您希望避免传递给您的好友作为联系地址，此操作是有用的。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22036,7 +23505,7 @@ Also check your ports!</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation>下载速率 (KB/s)</translation>
     </message>
@@ -22051,23 +23520,23 @@ Also check your ports!</source>
         <translation>上传速率 (KB/s)</translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;上传限制涉及整个软件。上传限制太小可能最终会阻止低优先级服务(论坛，频道)。 最小的建议值为50KB/s。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -22078,7 +23547,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation>启用高级设置</translation>
     </message>
@@ -22088,7 +23567,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>高级模式</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22098,7 +23582,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished">127.0.0.1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation>I2P代理端口</translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
@@ -22138,7 +23632,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation>开始</translation>
     </message>
@@ -22153,7 +23647,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation>停止</translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished">接收</translation>
     </message>
@@ -22189,32 +23688,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished">中继</translation>
     </message>
@@ -22269,7 +23743,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished">总计:</translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22294,7 +23768,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22306,7 +23780,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>网络</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation>IP过滤</translation>
     </message>
@@ -22329,7 +23803,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation>状态</translation>
     </message>
@@ -22389,28 +23863,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>添加到白名单</translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation>隐藏服务配置</translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这是Tor代理的端口。你的RetroShare节点可以用这个端口连接到&lt;/p&gt;&lt;p&gt;隐藏节点。当你电脑上的端口激活后右边这个指示灯会变绿。&lt;/p&gt;&lt;p&gt;这并不意味着您的RetroShare流量通过Tor转发。只有你 &lt;/p&gt;&lt;p&gt;连接到隐藏节点 , 或者你自己运行一个隐藏节点才会正常工作。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果左边所示的监听端口在你的电脑上被成功激活，此LED灯会变绿，&lt;/p&gt;&lt;p&gt;这不意味着你的RetroShare流量通过Tor通信。只有连接到隐藏节点&lt;/p&gt;&lt;p&gt;或者您自己运行一个隐藏节点时才会通过Tor通信。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22426,18 +23889,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation>I2P 传出代理正常</translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation>服务地址</translation>
     </message>
@@ -22472,12 +23935,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>请填写服务地址</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation>IP 范围</translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation>DHT报告IP伪装 </translation>
     </message>
@@ -22500,22 +23963,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>被你添加</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;从以下来源收集白名单的IP：来自手动交换的证书中的IP，您在此窗口中输入的IP范围或安全订阅项。&lt;/p&gt;&lt;p&gt;RetroShare的默认行为是(1)始终允许连接到 IP 的节点在白名单中，即使该 IP 也被列入黑名单; (2)可选地要求 IP 在白名单中。您可以在每个 RetroShare 节点的窗口“详情”中更改每个节点的这种行为。 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DHT允许您使用BitTorrent的DHT网络回应好友的连接请求。它可以极大地改善连通性。没有信息被实际存储在DHT中。它仅用作代理系统与其他RetroShare节点联系。&lt;/p&gt;&lt;p&gt;节点探索服务将您信任好友的节点名称和ID发送给已连接的节点，来帮助他们选择新朋友。 但节点永远不会自动建立好友关系，并且节点仍然需要相互添加信任才会允许连接。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果您启用了该操作，一旦RetroShare设法从下面列出的网站获取你的IP，则符号将变绿。RetroShare也会使用其他方法来查找你的IP。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;该列表将自动填充在多个来源收集的信息：DHT报告的伪装节点，您输入的IP范围以及您好友报告的IP范围。 默认设置应保护您免受大规模流量中继。&lt;/p&gt;&lt;p&gt;自动猜测伪装IP可以将您的好友的IP置于黑名单中，这时请使用上下文菜单将其列入白名单。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -22550,7 +24013,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>自动屏蔽DHT伪装IP的范围</translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22560,12 +24023,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>Tor Socks 代理</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation>Tor 传出代理正常</translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation>Tor 代理没有启用</translation>
     </message>
@@ -22645,7 +24108,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation>选择您希望与之共享个人发帖密钥的节点</translation>
     </message>
@@ -22655,12 +24118,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation>共享给好友</translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation>分享</translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation>您可以通过分享让你的好友了解您的频道。 选择您的好友来分享频道。</translation>
@@ -22679,7 +24142,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>共享文件夹管理器</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation>共享文件目录</translation>
     </message>
@@ -22699,17 +24162,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>可见性</translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation>添加新的共享文件夹</translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation>添加共享目录</translation>
     </message>
@@ -22719,7 +24182,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation>应用并关闭</translation>
     </message>
@@ -22810,7 +24273,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>目录未找到或目录名称不可接受。</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation>这是一个共享文件夹的列表。您可以使用底部的按钮添加和删除文件夹。当您添加新文件夹时，该文件夹中所有文件都会被共享。您可以单独设置每个共享文件夹的共享标志。</translation>
     </message>
@@ -22818,7 +24281,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation>共享</translation>
     </message>
@@ -22869,16 +24332,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation>校验文件</translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation>下载所选项目</translation>
     </message>
@@ -22888,7 +24346,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>下载</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation>复制 RetroShare 链接至剪切板</translation>
     </message>
@@ -22903,7 +24361,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>发送 RetroShare 链接</translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation>某些文件已被忽略 </translation>
     </message>
@@ -22919,7 +24377,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>推荐内容</translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation>创建资源集合</translation>
     </message>
@@ -22944,7 +24402,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>从集合文件中下载...</translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23087,12 +24545,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation>载入设置</translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation>创建界面</translation>
     </message>
@@ -23116,7 +24574,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>记住密码</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation>登录</translation>
     </message>
@@ -23471,7 +24929,7 @@ This choice can be reverted in settings.</source>
         <translation>个人状态消息</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation>消息:</translation>
     </message>
@@ -23718,7 +25176,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation>删除所有标签</translation>
     </message>
@@ -23754,15 +25212,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation>Tor状态:</translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
@@ -23772,13 +25227,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
+        <translation>隐藏服务地址:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23788,57 +25248,12 @@ p, li { white-space: pre-wrap; }
         <translation>Onion地址:</translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished">错误</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished">未连接</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation>[等待Tor就绪]</translation>
     </message>
@@ -23846,7 +25261,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
@@ -23856,7 +25271,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation>Tor现在离线</translation>
     </message>
@@ -23867,12 +25282,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23900,7 +25314,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation>传输选项</translation>
@@ -23911,7 +25325,7 @@ p, li { white-space: pre-wrap; }
         <translation>最多同时下载任务:</translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation>共享文件目录</translation>
     </message>
@@ -23921,27 +25335,22 @@ p, li { white-space: pre-wrap; }
         <translation>自动共享接收文件目录(推荐)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation>编辑分享</translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished">设置共享文件目录</translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation>自动检查共享目录,每隔</translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation> (分钟)</translation>
     </message>
@@ -24026,7 +25435,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -24035,12 +25444,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24065,12 +25469,7 @@ p, li { white-space: pre-wrap; }
         <translation>允许直接下载:</translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation>顺序</translation>
     </message>
@@ -24129,13 +25528,37 @@ p, li { white-space: pre-wrap; }
         <source>Trust friend nodes with banned files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are seen by your friends.&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files are anonymously reachable through distant F2F tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&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;Sans&apos;; font-size:9pt; 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;RetroShare&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;可以在非好友间传输数据和搜索请求。这些数据只会通过已连接的好友进行匿名传输。&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;&quot;&gt;你可以在共享文件对话框中对每个共享文件夹分别设置以下共享标记：&lt;/span&gt;&lt;/p&gt;
+&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;好友可见：&lt;/span&gt;文件对好友可见。&lt;/li&gt;
+&lt;li style=&quot; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;匿名共享：&lt;/span&gt; 文件可以通过 F2F 隧道匿名访问。&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
     <message>
         <location line="-153"/>
         <source>Max. tunnel req. forwarded per second:</source>
         <translation>每秒最多转发隧道请求数量</translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;顺序&lt;/span&gt; 让传输以递增的顺序请求 1MB 的文件块，便于下载时预览。&lt;span style=&quot; font-weight:600;&quot;&gt;&#xa0; 随机&lt;/span&gt;  是完全随机的，有利于swarm集群下载。 Progressivexis purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;渐进&lt;/span&gt; 是一个折中方法，在部分文件末尾不到50MB内随机选择下一个块。 这允许一些随机性，同时防止大量空文件的初始化时间。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;如果磁盘空间低于此限制，RetroShare将暂停所有传输并且保存配置文件。 这可以防止某些系统丢失信息。 当这种情况发生时，弹出窗口会提醒你。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -24145,17 +25568,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这个值控制您的节点每秒可以转发多少个隧道请求。&lt;/p&gt;&lt;p&gt;如果你网络带宽充裕，可以将其提高到 30-40，以允许更长的隧道通过。 要慎重，因为这会产生许多小数据包，可能会显著减慢你自己的文件传输速度。&lt;/p&gt;&lt;p&gt;默认值为20。如果你不确定，保持默认值。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished">警告</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation>设置文件接收目录</translation>
     </message>
@@ -24183,7 +25596,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation>下载完成</translation>
     </message>
@@ -24207,23 +25620,39 @@ p, li { white-space: pre-wrap; }
         <source>%1 completed transfer</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have %1 completed downloads</source>
+        <translation type="vanished">您有 %1 个下载任务已完成</translation>
+    </message>
+    <message>
+        <source>You have %1 completed download</source>
+        <translation type="vanished">您有 %1 个下载任务已完成</translation>
+    </message>
+    <message>
+        <source>%1 completed downloads</source>
+        <translation type="vanished">%1 个下载任务已完成</translation>
+    </message>
+    <message>
+        <source>%1 completed download</source>
+        <translation type="vanished">%1 个下载任务已完成</translation>
+    </message>
 </context>
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation>下载</translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation>上传</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation>名称</translation>
@@ -24430,7 +25859,16 @@ p, li { white-space: pre-wrap; }
         <translation>指定...</translation>
     </message>
     <message>
-        <location line="+262"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;                                                             &lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and                                         distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming                                          (you can be a source while downloading)&lt;/p&gt;                                         &lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar.     These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files     in their Friends Files tab&lt;/p&gt;    &lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached     anonymously using the multi-hop tunnelling system.&lt;/p&gt;     </source>
+        <translation type="vanished">&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/images/64px_help.png&quot;&gt;&amp;nbsp;&amp;nbsp;文件传输&lt;/h1&gt;
+&lt;p&gt;RetroShare 支持两种文件传输方式：来自好友的直接传输，及匿名远程隧道传输。
+此外文件传输支持多文件源及swarm集群(下载时可以作为文件源)。&lt;/p&gt;
+&lt;p&gt;你可以通过左侧的 &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=16 /&gt; 图标共享文件。
+这些文件将在我的文件标签中列出。&lt;p&gt;&lt;/p&gt;你可以在好友的文件标签中决定每个好友分组是否可以看到你的文件。&lt;/p&gt;
+&lt;p&gt;搜索标签列出来自好友文件列表中的文件，及通过多跳隧道系统匿名可见的远程文件。&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation>队列位置...</translation>
     </message>
@@ -24455,7 +25893,7 @@ p, li { white-space: pre-wrap; }
         <translation>选择目录</translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation>匿名和端对端加密路由 0x</translation>
     </message>
@@ -24476,7 +25914,7 @@ p, li { white-space: pre-wrap; }
         <translation>RetroShare </translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24509,17 +25947,7 @@ p, li { white-space: pre-wrap; }
         <translation>文件 %1 未完成。但如果是媒体文件，仍可尝试预览。</translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished">警告</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation>修改文件名</translation>
     </message>
@@ -24534,7 +25962,7 @@ p, li { white-space: pre-wrap; }
         <translation>输入新的有效文件名</translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation>全部展开</translation>
@@ -24661,18 +26089,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation>列</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation>文件传输</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
@@ -24682,7 +26115,7 @@ p, li { white-space: pre-wrap; }
         <translation>显示路径栏</translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation>不能删除之前文件</translation>
     </message>
@@ -24692,7 +26125,7 @@ p, li { white-space: pre-wrap; }
         <translation>再试一次？</translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation>创建资源集合</translation>
     </message>
@@ -24707,12 +26140,7 @@ p, li { white-space: pre-wrap; }
         <translation>打开资源集合</translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+193"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation>资源集合</translation>
     </message>
@@ -24722,7 +26150,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation>匿名Turtle路由</translation>
     </message>
@@ -24943,6 +26371,10 @@ p, li { white-space: pre-wrap; }
         <source>File transfer tunnels</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Anonymous tunnels</source>
+        <translation type="vanished">匿名Turtle路由</translation>
+    </message>
     <message>
         <location line="+1"/>
         <source>Authenticated tunnels</source>
@@ -25136,17 +26568,12 @@ p, li { white-space: pre-wrap; }
         <translation>表单</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation>启用RetroShare网页界面。</translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished">状态:</translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation>网页参数</translation>
     </message>
@@ -25180,33 +26607,31 @@ p, li { white-space: pre-wrap; }
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: these settings do not affect retroshare-service, which has a command line switch to activate the web interface and select the listening port.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Port:</source>
+        <translation type="vanished">端口:</translation>
+    </message>
     <message>
         <location line="-28"/>
         <source>Allow access from all IP addresses (Default: localhost only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <source>Apply setting and start browser</source>
+        <translation type="vanished">应用设置并打开浏览器</translation>
+    </message>
+    <message>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;网页界面&lt;/h1&gt;       &lt;p&gt;网页界面允许您从浏览器控制 RetroShare 。多个设备可以通过一个 RetroShare 实例共享控制。 所以，您可以在平板电脑上开始对话，然后使用台式电脑继续操作。&lt;/p&gt;     &lt;p&gt;警告：不要将网络接口暴露在互联网上，因为没有访问控制和加密。 如果要通过互联网使用网络接口，请使用SSH隧道或代理来保护连接。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation>不打开网页界面</translation>
     </message>
@@ -25216,12 +26641,12 @@ p, li { white-space: pre-wrap; }
         <translation>无法打开网页界面，请到设置 -&gt; 网络界面里进行设置</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation>无法打开网页界面</translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation>网页界面</translation>
     </message>
@@ -25358,7 +26783,11 @@ p, li { white-space: pre-wrap; }
         <translation>Wiki页面</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <source>New Group</source>
+        <translation type="vanished">新建分组</translation>
+    </message>
+    <message>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation>页面名称</translation>
     </message>
@@ -25373,7 +26802,7 @@ p, li { white-space: pre-wrap; }
         <translation>原始 ID</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation>&lt;&lt;</translation>
     </message>
@@ -25461,7 +26890,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation>页面历史版本</translation>
     </message>
@@ -25496,7 +26925,7 @@ p, li { white-space: pre-wrap; }
         <translation>页面Id</translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation>\/</translation>
     </message>
@@ -25526,18 +26955,14 @@ p, li { white-space: pre-wrap; }
         <translation>标签</translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished">历史</translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation>显示编辑历史</translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation>状态</translation>
     </message>
@@ -25558,7 +26983,7 @@ p, li { white-space: pre-wrap; }
         <translation>撤销</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation>提交</translation>
     </message>
@@ -25630,6 +27055,10 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>WireDialog</name>
+    <message>
+        <source>TimeRange</source>
+        <translation type="vanished">时间范围</translation>
+    </message>
     <message>
         <location filename="../gui/TheWire/WireDialog.ui" line="+65"/>
         <source>Create Account</source>
@@ -25641,7 +27070,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished">刷新</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25656,7 +27094,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">其他</translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25676,7 +27114,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25706,17 +27144,85 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>Last Month</source>
+        <translation type="vanished">上月</translation>
+    </message>
+    <message>
+        <source>Last Week</source>
+        <translation type="vanished">上周</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation type="vanished">今天</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">新建</translation>
+    </message>
+    <message>
+        <source>from</source>
+        <translation type="vanished">自从</translation>
+    </message>
+    <message>
+        <source>until</source>
+        <translation type="vanished">直到</translation>
+    </message>
+    <message>
+        <source>Search/Filter</source>
+        <translation type="vanished">搜索/过滤</translation>
+    </message>
+    <message>
+        <source>Network Wide</source>
+        <translation type="vanished">全网匿名可见</translation>
+    </message>
+    <message>
+        <source>Manage Accounts</source>
+        <translation type="vanished">管理账户</translation>
+    </message>
+    <message>
+        <source>Showing:</source>
+        <translation type="vanished">当前显示:</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation>我自己</translation>
     </message>
+    <message>
+        <source>Friends</source>
+        <translation type="vanished">好友</translation>
+    </message>
     <message>
         <location line="+5"/>
         <source>Following</source>
         <translation>以下</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <source>Custom</source>
+        <translation type="vanished">自定义</translation>
+    </message>
+    <message>
+        <source>Account 1</source>
+        <translation type="vanished">账户1</translation>
+    </message>
+    <message>
+        <source>Account 2</source>
+        <translation type="vanished">账户2</translation>
+    </message>
+    <message>
+        <source>Account 3</source>
+        <translation type="vanished">账户3</translation>
+    </message>
+    <message>
+        <source>CheckBox</source>
+        <translation type="vanished">复选框</translation>
+    </message>
+    <message>
+        <source>Post Pulse to Wire</source>
+        <translation type="vanished">向wire发刺探包 </translation>
+    </message>
+    <message>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25779,42 +27285,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">删除</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished">位置:</translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25859,41 +27358,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished">不适用</translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished">以下</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>未知</translation>
@@ -25971,7 +27440,7 @@ p, li { white-space: pre-wrap; }
         <translation>%1 年 %2 天</translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation>k</translation>
@@ -26004,11 +27473,15 @@ p, li { white-space: pre-wrap; }
         <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif *.webp)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Pictures (*.png *.jpeg *.xpm *.jpg *.tiff *.gif)</source>
+        <translation type="vanished">图片 (*.png *.xpm *.jpg *.tiff *.gif *.jpeg)</translation>
+    </message>
 </context>
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/lang/retroshare_zh_TW.ts b/retroshare-gui/src/lang/retroshare_zh_TW.ts
index 2acc19ab2..92a16dae4 100644
--- a/retroshare-gui/src/lang/retroshare_zh_TW.ts
+++ b/retroshare-gui/src/lang/retroshare_zh_TW.ts
@@ -121,12 +121,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+52"/>
         <source>Search Criteria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+76"/>
         <source>Add a further search criterion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -136,7 +136,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <location line="+39"/>
         <source>Cancels the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -156,6 +156,13 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AlbumCreateDialog</name>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">描述:</translation>
+    </message>
+</context>
 <context>
     <name>AlbumDialog</name>
     <message>
@@ -184,6 +191,10 @@
         <source>Caption</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">描述:</translation>
+    </message>
     <message>
         <location line="+54"/>
         <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;
@@ -540,7 +551,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+140"/>
+        <location line="+113"/>
         <source> Warning: The services here are experimental. Please help us test them. 
  But Remember: Any data here *WILL* be lost when we upgrade the protocols.</source>
         <translation type="unfinished"></translation>
@@ -566,23 +577,10 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>AspectRatioPixmapLabel</name>
-    <message>
-        <location filename="../util/AspectRatioPixmapLabel.cpp" line="+78"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>AttachFileItem</name>
     <message>
-        <location filename="../gui/feeds/AttachFileItem.ui" line="+103"/>
+        <location filename="../gui/feeds/AttachFileItem.ui" line="+94"/>
         <source>%p Kb</source>
         <translation type="unfinished"></translation>
     </message>
@@ -625,7 +623,7 @@ p, li { white-space: pre-wrap; }
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../gui/common/AvatarDialog.cpp" line="+62"/>
+        <location filename="../gui/common/AvatarDialog.cpp" line="+61"/>
         <source>Set your Avatar picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,7 +710,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+264"/>
+        <location line="+256"/>
         <source>Always on Top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -731,6 +729,10 @@ p, li { white-space: pre-wrap; }
         <source>% Opaque</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="vanished">取消 </translation>
+    </message>
     <message>
         <location filename="../gui/statistics/BandwidthGraphWindow.cpp" line="+195"/>
         <source>Since:</source>
@@ -808,7 +810,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidgetBase</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+66"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget.cpp" line="+63"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -838,12 +840,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+23"/>
         <source>&lt;p&gt;&lt;font color=&quot;#ff0000&quot;&gt;&lt;b&gt;The author of this message (with ID %1) is banned.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+14"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -851,7 +853,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_card</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_card.ui" line="+115"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -871,7 +873,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
@@ -909,7 +911,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardPostDisplayWidget_compact</name>
     <message>
-        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+118"/>
+        <location filename="../gui/Posted/BoardPostDisplayWidget_compact.ui" line="+102"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -929,7 +931,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+22"/>
         <source>Click to view picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -959,7 +961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+23"/>
         <source>Toggle Message Read Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -969,7 +971,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">新建</translation>
     </message>
     <message>
-        <location line="+66"/>
+        <location line="+59"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -977,12 +979,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BoardsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+67"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+16"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1002,18 +1004,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+564"/>
+        <location filename="../gui/feeds/BoardsCommentsItem.cpp" line="+559"/>
         <source>Expand</source>
         <translation type="unfinished">展開</translation>
     </message>
@@ -1028,12 +1030,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">刪除項目</translation>
     </message>
     <message>
-        <location line="+198"/>
+        <location line="+192"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>Comm value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1202,17 +1204,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPage</name>
     <message>
-        <location filename="../gui/settings/ChannelPage.h" line="+42"/>
+        <location filename="../gui/settings/ChannelPage.h" line="+40"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChannelPage.ui" line="+46"/>
+        <location filename="../gui/settings/ChannelPage.ui" line="+17"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="+12"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1222,17 +1224,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
-        <source>Downloads</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <source>Maximum Auto Download Size (in GBs)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/settings/ChannelPage.cpp" line="+34"/>
+        <location filename="../gui/settings/ChannelPage.cpp" line="+33"/>
         <source>Open each channel in a new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,7 +1232,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ChannelPostDelegate</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+232"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+238"/>
         <source>files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1263,7 +1255,7 @@ into the image, so as to
 <context>
     <name>ChannelsCommentsItem</name>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+63"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.ui" line="+57"/>
         <source>I like this</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1288,18 +1280,18 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>New Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+48"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+19"/>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+479"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="+561"/>
         <source>Expand</source>
         <translation type="unfinished">展開</translation>
     </message>
@@ -1314,7 +1306,7 @@ into the image, so as to
         <translation type="unfinished">刪除項目</translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1324,7 +1316,17 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-8"/>
+        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-188"/>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Comments </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+176"/>
         <source>Hide</source>
         <translation type="unfinished">隱藏</translation>
     </message>
@@ -1332,7 +1334,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+156"/>
+        <location filename="../gui/chat/ChatLobbyDialog.ui" line="+153"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1523,7 +1525,7 @@ into the image, so as to
 <context>
     <name>ChatLobbyToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatLobbyToaster.ui" line="+133"/>
         <source>Show Chat Lobby</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1556,14 +1558,13 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <location line="+42"/>
+        <location line="+15"/>
         <source>Unknown Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <location line="+46"/>
+        <location line="+40"/>
+        <location line="+42"/>
         <source>Remove All</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1571,13 +1572,13 @@ into the image, so as to
 <context>
     <name>ChatLobbyWidget</name>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+133"/>
-        <location line="+71"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+117"/>
+        <location line="+74"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="-73"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1587,7 +1588,29 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+163"/>
+        <location line="+11"/>
+        <source>Private Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+577"/>
+        <source>Public Subscribed chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-570"/>
+        <source>Private chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <location line="+565"/>
+        <source>Public chat rooms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-431"/>
         <source>Create chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1597,7 +1620,7 @@ into the image, so as to
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+15"/>
         <source>Create a non anonymous identity and enter this room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1654,12 +1677,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+245"/>
+        <location line="+244"/>
         <source>%1 invites you to chat room named %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+10"/>
         <source>Choose a non anonymous identity for this chat room:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1669,42 +1692,23 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-821"/>
+        <location line="-818"/>
         <location line="+1"/>
         <source>[No topic provided]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-240"/>
-        <source>Private Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <location line="+571"/>
-        <source>Public Subscribed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-564"/>
-        <location line="+756"/>
+        <location line="+530"/>
         <source>Private</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-749"/>
-        <location line="+559"/>
-        <location line="+190"/>
+        <location line="+0"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-705"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;&lt;p&gt;Chat rooms work pretty much like IRC.   They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;&lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you   invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;).   Once you have been invited to a private room, you will be able to see it when your friends   are using it.&lt;/p&gt;&lt;p&gt;The list at left shows   chat lobbies your friends are participating in. You can either   &lt;ul&gt;     &lt;li&gt;Right click to create a new chat room&lt;/li&gt;     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;   &lt;/ul&gt;   Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+706"/>
+        <location line="+1"/>
         <source>Anonymous IDs accepted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1714,22 +1718,27 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="-145"/>
+        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Chat Rooms&lt;/h1&gt;                              	                      &lt;p&gt;Chat rooms work pretty much like IRC.                                      	                      They allow you to talk anonymously with tons of people without the need to make friends.&lt;/p&gt;                    	                      &lt;p&gt;A chat room can be public (your friends see it) or private (your friends can&apos;t see it, unless you                                     invite them with &lt;img src=&quot;:/icons/png/add.png&quot; width=%2/&gt;). 	                      Once you have been invited to a private room, you will be able to see it when your friends   	                      are using it.&lt;/p&gt;                                                                                               	                      &lt;p&gt;The list at left shows                                                                                     	                      chat lobbies your friends are participating in. You can either                                 		  &lt;ul&gt;                                                                                                            			  &lt;li&gt;Right click to create a new chat room&lt;/li&gt;                                                              		     &lt;li&gt;Double click a chat room to enter, chat, and show it to your friends&lt;/li&gt;                      	                      &lt;/ul&gt; 	                      Note: For the chat rooms to work properly, your computer needs be on time.  So check your system clock!	                      &lt;/p&gt;                                      	                      </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+147"/>
         <source>Add Auto Subscribe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.ui" line="+162"/>
+        <location filename="../gui/ChatLobbyWidget.ui" line="+155"/>
         <source>Search Chat lobbies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="-151"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="-154"/>
         <source>Search Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+162"/>
+        <location line="+165"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1744,47 +1753,47 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+73"/>
         <source>Chat Room info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
+        <location line="+17"/>
         <source>Chat room Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+26"/>
         <source>Chat room Id:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Topic:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+29"/>
         <source>Type:</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+26"/>
         <source>Security:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+20"/>
         <source>Peers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <location line="+27"/>
-        <location line="+27"/>
-        <location line="+30"/>
-        <location line="+21"/>
-        <location line="+27"/>
+        <location line="-114"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <location line="+29"/>
+        <location line="+20"/>
+        <location line="+26"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1799,7 +1808,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-731"/>
+        <location line="-734"/>
         <location line="+3"/>
         <source>Show</source>
         <translation type="unfinished">顯示</translation>
@@ -1819,7 +1828,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatMsgItem</name>
     <message>
-        <location filename="../gui/feeds/ChatMsgItem.ui" line="+302"/>
+        <location filename="../gui/feeds/ChatMsgItem.ui" line="+297"/>
         <source>Remove Item</source>
         <translation>刪除項目</translation>
     </message>
@@ -1864,7 +1873,7 @@ Double click a chat room to enter and chat.</source>
     <name>ChatPage</name>
     <message>
         <location filename="../gui/settings/ChatPage.ui" line="+21"/>
-        <location line="+1184"/>
+        <location line="+1102"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1879,7 +1888,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-401"/>
+        <location line="-329"/>
         <source>Enable custom fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1899,7 +1908,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-294"/>
+        <location line="-284"/>
         <source>General settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1924,7 +1933,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+459"/>
+        <location line="+377"/>
         <source>Blink tab icon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1954,7 +1963,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-476"/>
+        <location line="-404"/>
         <source>Change Chat Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1964,7 +1973,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+631"/>
+        <location line="+559"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,7 +1997,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ChatPage.cpp" line="+519"/>
+        <location filename="../gui/settings/ChatPage.cpp" line="+481"/>
         <source>Choose your default font for Chat.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,22 +2067,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-862"/>
+        <location line="-790"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-13"/>
-        <source>When focus on text browser after showing chat room</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Shrink text edit field when not needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+175"/>
+        <location line="+165"/>
         <source>Fonts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,17 +2082,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>If your system is set up correctly, this next square should measure 1 cm.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>This next square is scaled accordingly to your system font size.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+65"/>
+        <location line="+66"/>
         <location line="+478"/>
         <source>Chat rooms</source>
         <translation type="unfinished"></translation>
@@ -2190,7 +2179,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1043"/>
+        <location line="-971"/>
         <source>Case sensitive</source>
         <translation>區分大小寫</translation>
     </message>
@@ -2296,7 +2285,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatToaster</name>
     <message>
-        <location filename="../gui/toaster/ChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/ChatToaster.ui" line="+133"/>
         <source>Show Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2332,7 +2321,7 @@ Double click a chat room to enter and chat.</source>
 <context>
     <name>ChatWidget</name>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="+530"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="+500"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2367,12 +2356,12 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-616"/>
+        <location line="-595"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chat menu&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+412"/>
+        <location line="+391"/>
         <source>Insert emoticon</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2452,6 +2441,11 @@ Double click a chat room to enter and chat.</source>
         <source>Insert horizontal rule</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+9"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+9"/>
         <source>Import sticker</source>
@@ -2489,7 +2483,7 @@ Double click a chat room to enter and chat.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="+1230"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="+1211"/>
         <source>is typing...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2511,7 +2505,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+111"/>
         <source>Do you really want to physically delete the history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2561,7 +2555,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-113"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-122"/>
         <source>Find Case Sensitively</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2583,7 +2577,7 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1730"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1686"/>
         <source>&lt;b&gt;Find Previous &lt;/b&gt;&lt;br/&gt;&lt;i&gt;Ctrl+Shift+G&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2598,12 +2592,12 @@ after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.ui" line="-911"/>
+        <location filename="../gui/chat/ChatWidget.ui" line="-890"/>
         <source>(Status)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+672"/>
+        <location line="+651"/>
         <source>Attach a File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2619,12 +2613,12 @@ after HTML conversion.</source>
     </message>
     <message>
         <location filename="../gui/chat/ChatWidget.cpp" line="+11"/>
-        <location line="+1350"/>
+        <location line="+1331"/>
         <source>&lt;b&gt;Mark this selected text&lt;/b&gt;&lt;br&gt;&lt;i&gt;Ctrl+M&lt;/i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-867"/>
+        <location line="-848"/>
         <source>Person id: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2635,12 +2629,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+468"/>
+        <location line="+444"/>
         <source> Unsigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
+        <location line="+356"/>
         <source> items found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2660,7 +2654,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/ChatWidget.cpp" line="-1363"/>
+        <location filename="../gui/chat/ChatWidget.cpp" line="-1344"/>
         <source>Don&apos;t stop to color after</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2686,7 +2680,7 @@ Double click on it to add his name on text writer.</source>
 <context>
     <name>CirclesDialog</name>
     <message>
-        <location filename="../gui/Circles/CirclesDialog.ui" line="+118"/>
+        <location filename="../gui/Circles/CirclesDialog.ui" line="+111"/>
         <source>Showing details: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2708,7 +2702,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="+598"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="+603"/>
         <source>Personal Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2734,7 +2728,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+21"/>
-        <location filename="../gui/Circles/CirclesDialog.cpp" line="-445"/>
+        <location filename="../gui/Circles/CirclesDialog.cpp" line="-447"/>
         <source>Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2794,7 +2788,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+445"/>
+        <location line="+447"/>
         <source>External Circles (Admin)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2810,7 +2804,7 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location filename="../gui/Circles/CirclesDialog.ui" line="-28"/>
-        <location filename="../gui/Circles/CirclesDialog.h" line="+42"/>
+        <location filename="../gui/Circles/CirclesDialog.h" line="+43"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2862,45 +2856,45 @@ Double click on it to add his name on text writer.</source>
     <message>
         <location filename="../gui/connect/ConfCertDialog.cpp" line="-65"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-239"/>
+        <location line="-232"/>
         <location line="+122"/>
-        <location line="+118"/>
+        <location line="+111"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-95"/>
         <source>Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>&lt;p&gt;This Retroshare ID contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+4"/>
         <source>&lt;p&gt;This certificate contains:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+25"/>
         <source>&lt;li&gt; &lt;b&gt;onion address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <location line="+3"/>
+        <location line="+1"/>
         <source>&lt;li&gt;&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-9"/>
+        <location line="+5"/>
         <source>&lt;b&gt;IP address&lt;/b&gt; and &lt;b&gt;port&lt;/b&gt;: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2910,7 +2904,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-163"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-171"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2992,17 +2986,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+132"/>
+        <location line="+136"/>
         <source>&lt;li&gt;a &lt;b&gt;node ID&lt;/b&gt; and &lt;b&gt;name&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>&lt;b&gt;DNS:&lt;/b&gt; : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+21"/>
         <source>&lt;p&gt;You can use this Retroshare ID to make new friends. Send it by email, or give it hand to hand.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3022,7 +3011,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConfCertDialog.cpp" line="-38"/>
+        <location filename="../gui/connect/ConfCertDialog.cpp" line="-27"/>
         <source>with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3090,7 +3079,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+303"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+300"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3106,12 +3095,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+218"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="+186"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+44"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
@@ -3121,17 +3110,17 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+149"/>
         <source>Options</source>
         <translation>選項</translation>
     </message>
     <message>
-        <location line="-643"/>
+        <location line="-593"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend&apos;s Retroshare certificate. WARNING: this is different from your friend&apos;s profile key. Do not paste your friend&apos;s profile key here (not even a part of it). It&apos;s not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+627"/>
+        <location line="+577"/>
         <source>Add friend to group:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3141,7 +3130,7 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-694"/>
+        <location line="-644"/>
         <source>Please paste below your friend&apos;s Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3166,22 +3155,12 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+501"/>
-        <source>Signers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+49"/>
-        <source>Known IP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+45"/>
+        <location line="+545"/>
         <source>Add as friend to connect with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-393"/>
+        <location line="-343"/>
         <source>Sorry, some error appeared</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3201,27 +3180,32 @@ Double click on it to add his name on text writer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+164"/>
+        <location line="+132"/>
         <source>Key validity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+52"/>
         <source>Profile ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+52"/>
+        <source>Signers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend&apos;s key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-145"/>
         <source>This peer is already on your friend list. Adding it might just set it&apos;s ip address.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+382"/>
         <source>To accept the Friend Request, click the Accept button.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3267,17 +3251,17 @@ Double click on it to add his name on text writer.</source>
     </message>
     <message>
         <location line="+66"/>
-        <location line="+342"/>
+        <location line="+330"/>
         <source>Certificate Load Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+254"/>
+        <location line="+241"/>
         <source>Not a valid Retroshare certificate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-806"/>
+        <location line="-781"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3297,12 +3281,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <location line="+134"/>
         <location line="+24"/>
         <location line="+31"/>
-        <location line="+326"/>
+        <location line="+314"/>
         <source>This is your own certificate! You would not want to make friend with yourself. Wouldn&apos;t you?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-367"/>
+        <location line="-355"/>
         <location line="+25"/>
         <location line="+38"/>
         <location line="+16"/>
@@ -3310,7 +3294,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+107"/>
+        <location line="+106"/>
         <source>This key is already on your trusted list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3350,7 +3334,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+233"/>
+        <location line="+222"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3375,7 +3359,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+114"/>
         <source>Valid Retroshare ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3385,7 +3369,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+41"/>
         <location line="+19"/>
         <location line="+20"/>
         <source>RetroShare Certificate (*.rsc );;All Files (*)</source>
@@ -3424,7 +3408,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-263"/>
+        <location filename="../gui/connect/ConnectFriendWizard.ui" line="-221"/>
         <source>IP-Addr:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3434,7 +3418,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+10"/>
         <source>Show Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3459,7 +3443,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-615"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="-590"/>
         <source>This key is already in your keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3472,7 +3456,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-220"/>
+        <location line="-219"/>
         <source>Certificate has wrong version number. Remember that v0.6 and v0.5 networks are incompatible.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3507,7 +3491,7 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+209"/>
+        <location filename="../gui/connect/ConnectFriendWizard.cpp" line="+208"/>
         <source>No IP in this certificate!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3517,7 +3501,12 @@ even if you don&apos;t make friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
+        <location line="+123"/>
+        <source>[Unknown]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+199"/>
         <source>Added with certificate from %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3582,7 +3571,7 @@ even if you don&apos;t make friends.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+441"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="+413"/>
         <source>UDP Setup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3610,7 +3599,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-551"/>
+        <location filename="../gui/connect/ConnectProgressDialog.cpp" line="-523"/>
         <source>Connection Assistant</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3620,20 +3609,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <location line="+28"/>
+        <location line="+72"/>
         <source>Unknown State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Offline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
-        <location line="+28"/>
+        <location line="+3"/>
         <source>Behind Symmetric NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3643,14 +3629,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+31"/>
+        <location line="+3"/>
         <source>NET Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+30"/>
+        <location line="+3"/>
         <source>Behind NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3660,8 +3644,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
-        <location line="+32"/>
+        <location line="+3"/>
         <source>NET STATE GOOD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3686,7 +3669,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+49"/>
         <source>Lookup requires DHT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3978,7 +3961,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-729"/>
+        <location line="-701"/>
         <location line="+1"/>
         <location line="+32"/>
         <location line="+4"/>
@@ -3986,8 +3969,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
-        <location line="+31"/>
+        <location line="+113"/>
         <source>UNVERIFIABLE FORWARD!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3997,7 +3979,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+213"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4033,12 +4015,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+222"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-193"/>
+        <location line="-195"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The circle name, contact author and invited member list will be visible to all invited members. If the circle is not private, it will also be visible to neighbor nodes of the nodes who host the invited members.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4058,7 +4040,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+64"/>
         <source>IDs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4078,18 +4060,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+37"/>
         <source>Cancel</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="-107"/>
+        <location line="-100"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-103"/>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+685"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+87"/>
         <source>Invited Members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4104,7 +4086,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-277"/>
+        <source>Type</source>
+        <translation type="vanished">類型</translation>
+    </message>
+    <message>
+        <location line="-279"/>
         <source>Name:</source>
         <translation type="unfinished">名稱:</translation>
     </message>
@@ -4144,19 +4130,19 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-522"/>
-        <location line="+130"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+74"/>
+        <location line="+126"/>
         <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-136"/>
+        <location line="-132"/>
         <source>Please set a name for your Circle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
         <source>No Restriction Circle Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4166,24 +4152,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
-        <source>Circle created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Your new circle has been created:
-   Name: %1
-   Id: %2.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+247"/>
+        <location line="+289"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+91"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+93"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
@@ -4193,7 +4167,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-804"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-784"/>
         <location line="+2"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -4246,13 +4220,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+56"/>
+        <location filename="../gui/Circles/CreateCircleDialog.ui" line="+49"/>
         <location filename="../gui/Circles/CreateCircleDialog.cpp" line="-5"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+720"/>
+        <location filename="../gui/Circles/CreateCircleDialog.cpp" line="+700"/>
         <source>Add Member</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4271,7 +4245,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+26"/>
         <source>Group Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4306,7 +4280,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsChannelMsg</name>
     <message>
         <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="+17"/>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+66"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+65"/>
         <source>New Channel Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4316,7 +4290,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4461,17 +4435,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+37"/>
-        <location line="+242"/>
+        <location line="+240"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-242"/>
+        <location line="-240"/>
         <source>This file already in this post:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+218"/>
+        <location line="+216"/>
         <source>Post refers to non shared files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4496,12 +4470,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
-        <source>Cannot publish post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="+63"/>
         <source>Load thumbnail picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4516,12 +4485,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-469"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.ui" line="-462"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-152"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="-722"/>
+        <location filename="../gui/gxschannels/CreateGxsChannelMsg.cpp" line="+0"/>
+        <source>Do you really want to generate %1 messages ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-593"/>
         <source>You are about to add files you&apos;re not actually sharing. Do you still want this to happen?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4555,7 +4530,7 @@ p, li { white-space: pre-wrap; }
     <name>CreateGxsForumMsg</name>
     <message>
         <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="+14"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+87"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="+88"/>
         <source>Post Forum Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,16 +4540,7 @@ p, li { white-space: pre-wrap; }
         <translation>論壇</translation>
     </message>
     <message>
-        <location line="+31"/>
-        <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 Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+44"/>
+        <location line="+75"/>
         <source>Attach File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4589,7 +4555,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+114"/>
+        <location line="+21"/>
+        <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 Sans Serif&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Sans Serif&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+93"/>
         <source>Attach a Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4604,7 +4579,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+48"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4634,17 +4609,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+99"/>
         <source>No Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+131"/>
+        <location line="+140"/>
         <source>In Reply to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Title</source>
         <translation type="unfinished">標題</translation>
     </message>
@@ -4697,7 +4672,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+72"/>
+        <location line="+108"/>
         <source>No compatible ID for this forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4707,8 +4682,8 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-44"/>
-        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-149"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.ui" line="-37"/>
+        <location filename="../gui/gxsforums/CreateGxsForumMsg.cpp" line="-185"/>
         <source>Generate mass data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4731,7 +4706,7 @@ Do you want to discard this message?</source>
 <context>
     <name>CreateLobbyDialog</name>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+50"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+45"/>
         <source>A chat room is a decentralized and anonymous chat group. All participants receive all messages. Once the room is created you can invite other friend nodes with invite button on top right.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4766,7 +4741,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+109"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4776,7 +4751,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="-120"/>
+        <location line="-113"/>
         <source>require PGP-signed identities</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4791,7 +4766,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-159"/>
+        <location line="-154"/>
         <location filename="../gui/chat/CreateLobbyDialog.cpp" line="+45"/>
         <source>Create Chat Room</source>
         <translation type="unfinished"></translation>
@@ -4812,7 +4787,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+79"/>
+        <location filename="../gui/chat/CreateLobbyDialog.ui" line="+74"/>
         <source>Identity to use:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4820,17 +4795,17 @@ Do you want to discard this message?</source>
 <context>
     <name>CryptoPage</name>
     <message>
-        <location filename="../gui/settings/CryptoPage.ui" line="+217"/>
+        <location filename="../gui/settings/CryptoPage.ui" line="+222"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+208"/>
+        <location line="+206"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
-        <location line="-237"/>
+        <location line="-234"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4840,12 +4815,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+190"/>
         <source>Software Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-98"/>
+        <location line="-97"/>
         <source>Online since:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4865,7 +4840,12 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+126"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4875,7 +4855,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+34"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4885,12 +4865,17 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+72"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
+        <source>Certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+35"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option includes all signatures of your profile key. Signatures are not mandatory, but only a way to express your trust in some particular profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4885,7 @@ Do you want to discard this message?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/CryptoPage.cpp" line="+83"/>
+        <location filename="../gui/settings/CryptoPage.cpp" line="+79"/>
         <source>Export Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4970,33 +4955,33 @@ and use the import button to load it</source>
     </message>
     <message>
         <location filename="../gui/settings/CryptoPage.ui" line="-442"/>
-        <location line="+348"/>
+        <location line="+345"/>
         <location line="+35"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-457"/>
+        <location line="-454"/>
         <source>PGP fingerprint:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+409"/>
+        <location line="-42"/>
+        <source>Node information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+448"/>
         <source>PGP Id :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-116"/>
+        <location line="-115"/>
         <source>Friend nodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use this button to export your profile key. You can then import it in a different computer and make a new node with the same profile. Doing so, existing friends that you also add to the new node will automatically recognise that new node as friend.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+335"/>
+        <location line="+232"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The short format only contains the profile fingerprint, and authentication is based on the node ID (ID of the SSL key). If you choose the old (long) format, the certificate includes the full profile public key. There is no fundamental difference between making friends with either method, because the public profile keys will be exchanged and checked w.r.t. the fingerprint after connection.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5086,7 +5071,7 @@ and use the import button to load it</source>
 <context>
     <name>DLListDelegate</name>
     <message>
-        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+43"/>
+        <location filename="../gui/FileTransfer/DLListDelegate.cpp" line="+41"/>
         <source>B</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5754,7 +5739,7 @@ and use the import button to load it</source>
 <context>
     <name>DownloadToaster</name>
     <message>
-        <location filename="../gui/toaster/DownloadToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/DownloadToaster.ui" line="+152"/>
         <source>Start file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5762,38 +5747,38 @@ and use the import button to load it</source>
 <context>
     <name>ExprParamElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="+356"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="+366"/>
         <location line="+13"/>
-        <location line="+136"/>
+        <location line="+115"/>
         <source>to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-82"/>
+        <location line="-67"/>
         <source>ignore case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <location line="+70"/>
-        <source>yyyy-MM-dd</source>
+        <location line="+16"/>
+        <location line="+61"/>
+        <source>dd.MM.yyyy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-48"/>
-        <location line="+72"/>
+        <location line="-43"/>
+        <location line="+63"/>
         <source>KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-71"/>
-        <location line="+72"/>
+        <location line="-62"/>
+        <location line="+63"/>
         <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5801,12 +5786,12 @@ and use the import button to load it</source>
 <context>
     <name>ExpressionWidget</name>
     <message>
-        <location filename="../gui/advsearch/expressionwidget.ui" line="+12"/>
+        <location filename="../gui/advsearch/expressionwidget.ui" line="+32"/>
         <source>Expression Widget</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+76"/>
         <source>Delete this expression</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5968,7 +5953,7 @@ and use the import button to load it</source>
 <context>
     <name>FilesDefs</name>
     <message>
-        <location filename="../gui/common/FilesDefs.cpp" line="+38"/>
+        <location filename="../gui/common/FilesDefs.cpp" line="+37"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5978,7 +5963,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+3"/>
+        <location line="+2"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6038,21 +6023,11 @@ and use the import button to load it</source>
         <source>C </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+2"/>
-        <source>APK </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>DLL </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>FlatStyle_RDM</name>
     <message>
-        <location filename="../gui/RemoteDirModel.cpp" line="+978"/>
+        <location filename="../gui/RemoteDirModel.cpp" line="+969"/>
         <source>Friends Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6174,7 +6149,7 @@ and use the import button to load it</source>
     </message>
     <message>
         <location line="+10"/>
-        <location filename="../gui/common/FriendList.cpp" line="+151"/>
+        <location filename="../gui/common/FriendList.cpp" line="+150"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6216,7 +6191,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/FriendList.cpp" line="+188"/>
+        <location filename="../gui/common/FriendList.cpp" line="+185"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6252,7 +6227,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-255"/>
+        <location line="-252"/>
         <location line="+6"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -6268,7 +6243,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+220"/>
         <source>Profile details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6505,7 +6480,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>FriendRequestToaster</name>
     <message>
-        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+177"/>
+        <location filename="../gui/toaster/FriendRequestToaster.ui" line="+152"/>
         <source>Confirm Friend Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6543,7 +6518,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+715"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6554,132 +6529,16 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>FriendServerControl</name>
-    <message>
-        <location filename="../gui/FriendServerControl.ui" line="+19"/>
-        <source>Server onion address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter here the onion address of the Friend Server that was given to you. The address will be automatically checked after you enter it and a green bullet will appear if the server is online.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Onion address of the friend server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Communication port of the server. You usually get a server address as somestring.onion:port. The port is the number right after &amp;quot;:&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+66"/>
-        <source>Retroshare passphrase:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+13"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your Retroshare login passphrase is needed to ensure the security of data exchange with the friend server.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Your retroshare passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+18"/>
-        <source>On/Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Friends to request: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Auto accept received certificates as friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Auto-accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Node ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+64"/>
-        <source>                          &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Friend Server&lt;/h1&gt;                                                     &lt;p&gt;This configuration panel allows you to specify the onion address of a                                                               friend server. Retroshare will talk to that server anonymously through Tor                                                           and use it to acquire a fixed number of friends.&lt;/p&gt;                                                                               &lt;p&gt;The friend server will continue supplying new friends until that number is reached                                                  in particular if you add your own friends manually, the friend server may become useless                                             and you will save bandwidth disabling it. When disabling it, you will keep existing friends.&lt;/p&gt;                                                                                      &lt;p&gt;The friend server only knows your peer ID and profile public key. It doesn&apos;t know your IP address.&lt;/p&gt;                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>Make friend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+86"/>
-        <source>Missing profile passphrase.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Your profile passphrase is missing. Please enter is in the field below before enabling the friend server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Trying to contact friend server
-This may take up to 1 min.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+37"/>
-        <source>Friend server is currently reachable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>The proxy is not enabled or broken.
-Are all services up and running fine??
-Also check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>FriendsDialog</name>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="+181"/>
+        <location filename="../gui/FriendsDialog.ui" line="+174"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <location filename="../gui/FriendsDialog.cpp" line="+78"/>
+        <location line="+67"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+74"/>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6762,38 +6621,33 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+22"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+18"/>
         <source>Keyring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-26"/>
+        <location line="+32"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;                                       &lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.     &lt;/p&gt;                                                       &lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow          some nodes to see some of your files.&lt;/p&gt;     &lt;p&gt;On the right, you will find 3 useful tabs:                                                                       &lt;ul&gt;                                                                                                                &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;                                   &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;                       &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;                                  &lt;/ul&gt; &lt;/p&gt;                                                                                                        </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-54"/>
         <source>Retroshare broadcast chat: messages are sent to all connected friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.ui" line="-286"/>
-        <location filename="../gui/FriendsDialog.h" line="+56"/>
+        <location filename="../gui/FriendsDialog.ui" line="-279"/>
+        <location filename="../gui/FriendsDialog.h" line="+55"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FriendsDialog.cpp" line="+23"/>
-        <source>Friend Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location filename="../gui/FriendsDialog.cpp" line="+21"/>
         <source>Network graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Network&lt;/h1&gt;&lt;p&gt;The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you.&lt;/p&gt;&lt;p&gt;You can group nodes together to allow a finer level of information access, for instance to only allow   some nodes to see some of your files.&lt;/p&gt;&lt;p&gt;On the right, you will find 3 useful tabs:   &lt;ul&gt;    &lt;li&gt;Broadcast sends messages to all connected nodes at once&lt;/li&gt;    &lt;li&gt;Local network graph shows the network around you, based on discovery information&lt;/li&gt;    &lt;li&gt;Keyring contains node keys you collected, mostly forwarded to you by your friend nodes&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+130"/>
+        <location line="+165"/>
         <source>Set your status message here.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6811,17 +6665,7 @@ Also check your ports!</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location line="+163"/>
-        <source>SAMv3 support is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+100"/>
-        <source>I2P instance address with SAMv3 enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+132"/>
+        <location line="+403"/>
         <source>All fields are required with a minimum of 3 characters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6831,12 +6675,17 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="+492"/>
+        <location filename="../gui/GenCertDialog.ui" line="+456"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+202"/>
+        <location line="+29"/>
+        <source>Use BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+159"/>
         <location line="+25"/>
         <source>This password is for PGP</source>
         <translation type="unfinished"></translation>
@@ -6857,38 +6706,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-535"/>
+        <location filename="../gui/GenCertDialog.ui" line="-485"/>
         <source>PGP Key Length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
-        <location line="+196"/>
+        <location line="+51"/>
+        <location line="+172"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Put a strong password here. This password protects your private node key!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-150"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please move your mouse around in order to collect as much randomness as possible. A minimum of 20% is needed to create your node keys.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-148"/>
         <source>Standard node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+196"/>
+        <location line="+184"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your node name designates the Retroshare instance that&lt;/p&gt;&lt;p&gt;will run on this computer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-499"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-507"/>
         <source>Node name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-210"/>
+        <location filename="../gui/GenCertDialog.ui" line="-198"/>
         <source>Node type:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6908,12 +6757,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+203"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The profile name identifies you over the network.&lt;/p&gt;&lt;p&gt;It is used by your friends to accept connections from you.&lt;/p&gt;&lt;p&gt;You can create multiple Retroshare nodes with the&lt;/p&gt;&lt;p&gt;same profile on different computers.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="+35"/>
         <source>Export this profle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6923,43 +6772,38 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+61"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This should be a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;br/&gt;or an I2P address in the form: [52 characters].b32.i2p &lt;/p&gt;&lt;p&gt;In order to get one, you must configure either Tor or I2P to create a new hidden service / server tunnel. &lt;/p&gt;&lt;p&gt;You can also leave this blank now, but your node will only work if you correctly set the Tor/I2P service address in Options-&amp;gt;Network-&amp;gt;Hidden Service configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Use I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+54"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Identities are used when you write in chat rooms, forums and channel comments. &lt;/p&gt;&lt;p&gt;They also receive/send email over the Retroshare network. You can create&lt;/p&gt;&lt;p&gt;a signed identity now, or do it later on when you get to need it.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+27"/>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-503"/>
-        <location line="+693"/>
+        <location line="-453"/>
+        <location line="+638"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="+273"/>
+        <location filename="../gui/GenCertDialog.cpp" line="+281"/>
         <source>hidden address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-394"/>
+        <location filename="../gui/GenCertDialog.ui" line="-363"/>
         <source>Your profile is associated with a PGP key pair. RetroShare currently ignores DSA keys.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+138"/>
+        <location line="+120"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7003,13 +6847,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.ui" line="-109"/>
+        <location filename="../gui/GenCertDialog.ui" line="-91"/>
         <location filename="../gui/GenCertDialog.cpp" line="+70"/>
         <source>Import profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GenCertDialog.cpp" line="-162"/>
+        <location filename="../gui/GenCertDialog.cpp" line="-168"/>
         <source>Create new profile and new Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7019,7 +6863,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
+        <location line="-121"/>
         <source>Tor/I2P address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7054,7 +6898,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+36"/>
         <source>&lt;html&gt;&lt;p&gt;Put a strong password here. This password will be required to start your Retroshare node and protects all your data.&lt;/p&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7064,7 +6908,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+21"/>
+        <source>BOB support is not available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
         <source>&lt;p&gt;Node creation is disabled until all fields correctly set.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7074,7 +6923,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+86"/>
+        <source>I2P instance address with BOB enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
         <source>I2P instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7300,13 +7154,27 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+43"/>
         <location line="+23"/>
         <source>Invite Friends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+22"/>
+        <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:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+31"/>
         <source>Add Your Friends to RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7316,57 +7184,39 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
-        <source>Connect To Friends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="+107"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;RetroShare is nothing without your Friends. Click on the Button to start the process.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Email an Invitation with your &amp;quot;ID Certificate&amp;quot; to your friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be sure to get their invitation back as well... &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can only connect with friends if you have both added each other.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+84"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+85"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Be Online at the same time as your friends, and RetroShare will automatically connect you!&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Your client needs to find the RetroShare Network before it can make connections.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This takes 5-30 minutes the first time you start up RetroShare&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The DHT indicator (in the Status Bar) turns Green when it can make connections.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If it remains Red, then you have a Nasty Firewall, that RetroShare struggles to connect through.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Look in the Further Help section for more advice about connecting.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
-        <source>Advanced: Open Firewall Port</source>
+&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:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -7374,45 +7224,49 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;You can improve your Retroshare performance by opening an External Port. &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;This will speed up connections and allow more people to connect with you. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;The easiest way to do this is by enabling UPnP on your Wireless Box or Router.&lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;As each router is different, you will need to find out your Router Model and search the Internet for instructions.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;If none of this makes sense to you, don&apos;t worry about it Retroshare will still work.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="-186"/>
+        <source>Connect To Friends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-31"/>
+        <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:12pt;&quot;&gt;When your friends send you their invitations, click to open the Add Friends window.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt;&quot;&gt;&lt;/p&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:12pt;&quot;&gt;Paste your Friends&apos; &amp;quot;ID Certificates&amp;quot; into the window and add them as friends.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Advanced: Open Firewall Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+90"/>
         <source>Further Help and Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Having trouble getting started with RetroShare?&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;1) Look at the FAQ Wiki. This is a bit old, we are trying to bring it up to date.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;2) Check out the Online Forums. Ask questions and discuss features.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;3) Try the Internal RetroShare Forums &lt;/span&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;	- These come online once you are connected to friends.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;4) If you are still stuck. Email us.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;MS Shell Dlg 2&apos;; font-size:12pt;&quot;&gt;Enjoy Retrosharing&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Open RS Website</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7437,7 +7291,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/GetStartedDialog.cpp" line="+239"/>
+        <location filename="../gui/GetStartedDialog.cpp" line="+245"/>
         <source>RetroShare Invitation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7487,12 +7341,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+133"/>
+        <location line="+131"/>
         <source>RetroShare Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-184"/>
+        <location line="-182"/>
         <source>It has many features, including built-in chat, messaging,</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7616,7 +7470,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChatToaster</name>
     <message>
-        <location filename="../gui/toaster/GroupChatToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/GroupChatToaster.ui" line="+133"/>
         <source>Show Group Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7624,7 +7478,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupChooser</name>
     <message>
-        <location filename="../gui/common/GroupChooser.cpp" line="+51"/>
+        <location filename="../gui/common/GroupChooser.cpp" line="+50"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7794,7 +7648,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GroupTreeWidget</name>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.cpp" line="+143"/>
+        <location filename="../gui/common/GroupTreeWidget.cpp" line="+138"/>
         <source>Title</source>
         <translation>標題</translation>
     </message>
@@ -7807,12 +7661,12 @@ p, li { white-space: pre-wrap; }
         <location line="-37"/>
         <location line="+7"/>
         <location line="+31"/>
-        <location line="+319"/>
+        <location line="+318"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-355"/>
+        <location line="-354"/>
         <source>Number of Unread message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7837,7 +7691,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+295"/>
+        <location line="+294"/>
         <source>You are admin (modify names and description using Edit menu)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7852,14 +7706,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-354"/>
-        <location line="+339"/>
+        <location line="-353"/>
+        <location line="+338"/>
         <location line="+2"/>
         <source>Last Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-352"/>
+        <location line="-351"/>
         <location line="+7"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
@@ -7870,13 +7724,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+306"/>
         <location line="+33"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/GroupTreeWidget.ui" line="+103"/>
+        <location filename="../gui/common/GroupTreeWidget.ui" line="+98"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searches a single keyword into the reachable network.&lt;/p&gt;&lt;p&gt;Objects already provided by friend nodes are not reported.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7889,7 +7743,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GuiExprElement</name>
     <message>
-        <location filename="../gui/advsearch/guiexprelement.cpp" line="-452"/>
+        <location filename="../gui/advsearch/guiexprelement.cpp" line="-434"/>
         <source>and</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8025,7 +7879,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+160"/>
+        <location filename="../gui/gxschannels/GxsChannelDialog.cpp" line="+153"/>
         <location filename="../gui/gxschannels/GxsChannelDialog.h" line="+39"/>
         <source>Channels</source>
         <translation type="unfinished"></translation>
@@ -8036,22 +7890,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+109"/>
+        <location line="+108"/>
         <source>Enable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-102"/>
+        <location line="-101"/>
         <source>My Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-61"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;&lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;&lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to   your friends. This promotes good channels in the network.&lt;/p&gt;&lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers   in the network can only read from it, unless the channel is private. You can however share   the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;&lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.   Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;&lt;p&gt;Channel posts are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;&lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;</source>
+        <location line="-58"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Channels&lt;/h1&gt;        &lt;p&gt;Channels allow you to post data (e.g. movies, music) that will spread in the network&lt;/p&gt;                &lt;p&gt;You can see the channels your friends are subscribed to, and you automatically forward subscribed channels to     your friends. This promotes good channels in the network.&lt;/p&gt;    &lt;p&gt;Only the channel&apos;s creator can post on that channel. Other peers                           in the network can only read from it, unless the channel is private. You can however share 	 the posting rights or the reading rights with friend Retroshare nodes.&lt;/p&gt;	 &lt;p&gt;Channels can be made anonymous, or attached to a Retroshare identity so that readers can contact you if needed.	 Enable &quot;Allow Comments&quot; if you want to let users comment on your posts.&lt;/p&gt;    &lt;p&gt;Channel posts are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;    &lt;p&gt;UI Tip: use Control + mouse wheel to control image size in the thumbnail view.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+60"/>
         <source>Subscribed Channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8071,12 +7925,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+30"/>
         <source>Disable Auto-Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
+        <location line="+9"/>
         <source>Set download directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8111,22 +7965,22 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+49"/>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+102"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="+103"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-47"/>
+        <location filename="../gui/gxschannels/GxsChannelFilesStatusWidget.cpp" line="-48"/>
         <source>Open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+46"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+55"/>
+        <location line="+60"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8146,17 +8000,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+77"/>
         <source>Are you sure that you want to cancel and delete the file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+21"/>
         <source>Can&apos;t open folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+20"/>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8166,10 +8020,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelFilesWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">表單</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">標題</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelGroupDialog</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+83"/>
+        <location filename="../gui/gxschannels/GxsChannelGroupDialog.cpp" line="+82"/>
         <source>Create New Channel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8207,18 +8072,8 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+227"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Subscribe this Channel</source>
+        <location filename="../gui/feeds/GxsChannelGroupItem.ui" line="+202"/>
+        <source>Subscribe to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8233,7 +8088,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+231"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="+198"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -8248,7 +8103,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-138"/>
+        <location filename="../gui/feeds/GxsChannelGroupItem.cpp" line="-133"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8262,11 +8117,6 @@ p, li { white-space: pre-wrap; }
         <source>New Channel: </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+27"/>
         <source>Hide</source>
@@ -8276,7 +8126,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsChannelPostItem</name>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+167"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="+158"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8297,7 +8147,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+638"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="+606"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8359,18 +8209,18 @@ p, li { white-space: pre-wrap; }
         <translation>隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-263"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.ui" line="-255"/>
         <source>New</source>
         <translation>新建</translation>
     </message>
     <message>
-        <location line="+100"/>
+        <location line="+92"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-357"/>
-        <location line="+142"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-356"/>
+        <location line="+141"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8385,17 +8235,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-380"/>
+        <location filename="../gui/feeds/GxsChannelPostItem.cpp" line="-365"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+242"/>
+        <location line="+228"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+57"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8420,16 +8270,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GxsChannelPostsWidget</name>
+    <message>
+        <source>Title</source>
+        <translation type="vanished">標題</translation>
+    </message>
+    <message>
+        <source>Search Title</source>
+        <translation type="vanished">搜索標題</translation>
+    </message>
+    <message>
+        <source>Feeds</source>
+        <translation type="vanished">訂閱</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="vanished">描述:</translation>
+    </message>
+</context>
 <context>
     <name>GxsChannelPostsWidgetWithModel</name>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+97"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.ui" line="+84"/>
         <source>Post to Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+218"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+211"/>
         <source>Add new post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8499,7 +8368,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+22"/>
-        <source>Items (locally / at friends):</source>
+        <source>Posts (locally / at friends):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -8535,7 +8404,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="-61"/>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+538"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="+417"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8550,13 +8419,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">訂閱</translation>
     </message>
     <message>
-        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-610"/>
-        <location line="+287"/>
+        <location filename="../gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp" line="-487"/>
+        <location line="+230"/>
         <source>Click to switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-225"/>
         <source>Show unread posts only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8571,7 +8440,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+22"/>
         <source>No text to display</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8586,7 +8455,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="+84"/>
         <source>Switch to list view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8646,22 +8515,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+155"/>
         <source>Comments (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
-        <source>Loading...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
-        <source>No posts available in this channel.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+163"/>
+        <location line="+252"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8736,13 +8595,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <location line="+11"/>
+        <location line="+25"/>
         <source>Copy Retroshare link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+29"/>
         <source>Subscribed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8793,17 +8651,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCircleItem</name>
     <message>
-        <location filename="../gui/feeds/GxsCircleItem.ui" line="+173"/>
+        <location filename="../gui/feeds/GxsCircleItem.ui" line="+146"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+73"/>
+        <location line="+71"/>
         <source>Circle name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+43"/>
         <location filename="../gui/feeds/GxsCircleItem.cpp" line="+114"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
@@ -8918,7 +8776,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentContainer</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+58"/>
+        <location filename="../gui/gxs/GxsCommentContainer.ui" line="+51"/>
         <source>Comment Container</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8931,7 +8789,7 @@ p, li { white-space: pre-wrap; }
         <translation>表單</translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+82"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14px; color:#24292e; background-color:#ffffff;&quot;&gt;sort by&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8961,7 +8819,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-138"/>
+        <location line="-132"/>
         <location line="+46"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
@@ -9000,7 +8858,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GxsCommentTreeWidget</name>
     <message>
-        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+333"/>
+        <location filename="../gui/gxs/GxsCommentTreeWidget.cpp" line="+329"/>
         <source>Reply to Comment</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9024,21 +8882,6 @@ p, li { white-space: pre-wrap; }
         <source>Vote Down</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Show Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+73"/>
-        <source>Cannot vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>GxsCreateCommentDialog</name>
@@ -9048,7 +8891,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+81"/>
+        <location line="+73"/>
         <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; }
@@ -9077,7 +8920,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+22"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9108,7 +8951,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+20"/>
         <source>It remains %1 characters after HTML conversion.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9159,7 +9002,7 @@ before you can comment</source>
 <context>
     <name>GxsForumGroupItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+232"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.ui" line="+202"/>
         <source>Subscribe to Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9175,7 +9018,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+289"/>
+        <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="+262"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -9194,11 +9037,6 @@ before you can comment</source>
         <source>Moderator list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+21"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/feeds/GxsForumGroupItem.cpp" line="-188"/>
         <source>Loading...</source>
@@ -9228,13 +9066,13 @@ before you can comment</source>
 <context>
     <name>GxsForumMsgItem</name>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+207"/>
-        <location line="+331"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.ui" line="+178"/>
+        <location line="+329"/>
         <source>Subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-286"/>
+        <location line="-284"/>
         <source>Unsubscribe To Forum</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9245,7 +9083,7 @@ before you can comment</source>
     </message>
     <message>
         <location line="+16"/>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+448"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="+446"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -9265,17 +9103,17 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-328"/>
+        <location filename="../gui/feeds/GxsForumMsgItem.cpp" line="-345"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+230"/>
         <source>Forum Feed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+102"/>
         <source>Hide</source>
         <translation>隱藏</translation>
     </message>
@@ -9288,66 +9126,59 @@ before you can comment</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location line="+90"/>
+        <location line="+77"/>
         <source>Start new Thread for Selected Forum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+97"/>
-        <source>Threaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <location line="+20"/>
-        <location line="+20"/>
-        <source>...</source>
-        <translation type="unfinished">...</translation>
-    </message>
-    <message>
-        <location line="-23"/>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>Latest post in thread</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location line="+106"/>
         <source>Search forums</source>
         <translation>搜索論壇</translation>
     </message>
     <message>
-        <location line="-154"/>
+        <location line="-103"/>
         <source>New Thread</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+90"/>
+        <source>Threaded View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flat View</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="+316"/>
-        <location line="+481"/>
+        <location line="+488"/>
         <source>Title</source>
         <translation>標題</translation>
     </message>
     <message>
-        <location line="-480"/>
-        <location line="+492"/>
+        <location line="-487"/>
+        <location line="+499"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location line="-491"/>
+        <location line="-498"/>
         <source>Author</source>
         <translation>作者</translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+65"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.ui" line="+329"/>
+        <source>Save image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-369"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-26"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to clear current selected thread and display more information about this forum.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9357,7 +9188,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+171"/>
+        <location line="+53"/>
+        <source>Lastest post in thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Reply Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9397,23 +9233,23 @@ before you can comment</source>
         <translation>搜索作者</translation>
     </message>
     <message>
-        <location line="+190"/>
+        <location line="+178"/>
         <source>No name</source>
         <translation>未命名</translation>
     </message>
     <message>
-        <location line="-220"/>
-        <location line="+339"/>
+        <location line="-207"/>
+        <location line="+326"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-257"/>
+        <location line="-249"/>
         <source>&lt;p&gt;Subscribing to the forum will gather                                             available posts from your subscribed friends, and make the                                             forum visible to all other friends.&lt;/p&gt;&lt;p&gt;Afterwards you can unsubscribe from the context menu of the forum list at left.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+120"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9456,12 +9292,16 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+134"/>
+        <location line="+153"/>
         <source>Hide</source>
         <translation>隱藏</translation>
     </message>
     <message>
-        <location line="+189"/>
+        <source>Expand</source>
+        <translation type="vanished">展開</translation>
+    </message>
+    <message>
+        <location line="+187"/>
         <source>[unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9491,8 +9331,8 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-287"/>
-        <location line="+293"/>
+        <location line="-285"/>
+        <location line="+291"/>
         <source>Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9575,12 +9415,12 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1332"/>
+        <location line="-1336"/>
         <source>New thread</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+331"/>
+        <location line="+318"/>
         <source>Edit</source>
         <translation type="unfinished">編輯</translation>
     </message>
@@ -9641,7 +9481,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
+        <location line="+40"/>
         <source>Show column</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9661,7 +9501,7 @@ before you can comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+63"/>
         <source>Anonymous/unknown posts forwarded if reputation is positive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9713,7 +9553,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+636"/>
+        <location line="+639"/>
         <source>No result.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9723,7 +9563,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+159"/>
+        <location line="+155"/>
         <source>Failed to retrieve this message. Is the database currently overloaded?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9738,7 +9578,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-838"/>
+        <location line="-837"/>
         <source>(Latest) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -9804,12 +9644,12 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsForumsDialog</name>
     <message>
-        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+128"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to   your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;&lt;p&gt;Forum messages are kept for %2 days and sync-ed over the last %3 days, unless you configure it otherwise.&lt;/p&gt;</source>
+        <location filename="../gui/gxsforums/GxsForumsDialog.cpp" line="+113"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Forums&lt;/h1&gt;               			&lt;p&gt;Retroshare Forums look like internet forums, but they work in a decentralized way&lt;/p&gt;    			&lt;p&gt;You see forums your friends are subscribed to, and you forward subscribed forums to      			your friends. This automatically promotes interesting forums in the network.&lt;/p&gt;                        &lt;p&gt;Forum messages are kept for %1 days and sync-ed over the last %2 days, unless you configure it otherwise.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+38"/>
         <location filename="../gui/gxsforums/GxsForumsDialog.h" line="+37"/>
         <source>Forums</source>
         <translation>論壇</translation>
@@ -9844,12 +9684,12 @@ This message is missing. You should receive it later.</source>
     <name>GxsGroupDialog</name>
     <message>
         <location filename="../gui/gxs/GxsGroupDialog.ui" line="+111"/>
-        <location line="+481"/>
+        <location line="+484"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-429"/>
+        <location line="-432"/>
         <source>Key recipients can publish to restricted-type group and can view and publish for private-type channels</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9860,12 +9700,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+13"/>
-        <location line="+582"/>
+        <location line="+583"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-334"/>
+        <location line="-335"/>
         <source>Message Distribution</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9873,7 +9713,7 @@ This message is missing. You should receive it later.</source>
         <location line="+21"/>
         <location filename="../gui/gxs/GxsGroupDialog.cpp" line="+105"/>
         <location line="+159"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Public</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9933,7 +9773,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+287"/>
+        <location line="+290"/>
         <source>Comments:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9956,7 +9796,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-392"/>
+        <location filename="../gui/gxs/GxsGroupDialog.cpp" line="-393"/>
         <source>All People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9972,12 +9812,12 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+140"/>
-        <location line="+253"/>
+        <location line="+254"/>
         <source>Restricted to circle:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-248"/>
         <source>Limited to your friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9994,23 +9834,23 @@ This message is missing. You should receive it later.</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+386"/>
+        <location line="+393"/>
         <source>Message tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-385"/>
-        <location line="+387"/>
+        <location line="-392"/>
+        <location line="+395"/>
         <source>PGP signature required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-281"/>
+        <location line="-286"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+37"/>
         <source>Only friends nodes in group </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10026,28 +9866,22 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+88"/>
         <source>PGP signature from known ID required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+4"/>
-        <location line="+169"/>
-        <source>[None]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-65"/>
+        <location line="+106"/>
         <source>Load Group Logo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
+        <location line="-613"/>
         <source>Submit Group Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-474"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="-477"/>
         <source>Owner:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10057,12 +9891,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+421"/>
+        <location filename="../gui/gxs/GxsGroupDialog.ui" line="+434"/>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+94"/>
+        <location line="+84"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10072,7 +9906,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-140"/>
+        <location line="-143"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will spread way beyond your friend nodes, as long as people subscribe to the channel/forum/posted you&apos;re creating.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10147,12 +9981,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+201"/>
-        <source>Author:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+21"/>
+        <location line="+225"/>
         <source>Popularity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10168,22 +9997,27 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+20"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+41"/>
         <source>Cancel</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-173"/>
+        <location line="-230"/>
+        <source>Author</source>
+        <translation>作者</translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>GxsIdLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10191,7 +10025,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsGroupFrameDialog</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+102"/>
+        <location filename="../gui/gxs/GxsGroupFrameDialog.ui" line="+95"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10251,7 +10085,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+9"/>
         <source>Synchronise posts of last...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10308,12 +10142,12 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+761"/>
+        <location line="+722"/>
         <source>Search for</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-717"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10336,7 +10170,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdChooser</name>
     <message>
-        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+271"/>
+        <location filename="../gui/gxs/GxsIdChooser.cpp" line="+250"/>
         <source>No Signature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10349,14 +10183,14 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdDetails</name>
     <message>
-        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+1001"/>
+        <location filename="../gui/gxs/GxsIdDetails.cpp" line="+946"/>
         <source>Not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+21"/>
-        <location line="+55"/>
-        <location line="+27"/>
+        <location line="+56"/>
+        <location line="+24"/>
         <source>[Banned]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10366,7 +10200,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-130"/>
+        <location line="-128"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10376,12 +10210,7 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+74"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+29"/>
+        <location line="+101"/>
         <source>Identity&amp;nbsp;name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10401,14 +10230,6 @@ This message is missing. You should receive it later.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>GxsIdLabel</name>
-    <message>
-        <location filename="../gui/gxs/GxsIdLabel.cpp" line="+64"/>
-        <source>[Nobody]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>GxsIdStatistics</name>
     <message>
@@ -10420,7 +10241,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdStatisticsWidget</name>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+280"/>
+        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+278"/>
         <source>Total identities: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -10468,7 +10289,7 @@ This message is missing. You should receive it later.</source>
 <context>
     <name>GxsIdTreeItemDelegate</name>
     <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+218"/>
+        <location filename="../gui/gxs/GxsIdTreeWidgetItem.cpp" line="+207"/>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10855,7 +10676,7 @@ This message is missing. You should receive it later.</source>
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;RetroShare is an Open Source cross-platform, &lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;private and secure decentralized communication platform.	&lt;/span&gt;&lt;/p&gt;
 &lt;p align=&quot;justify&quot; 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;MS Shell Dlg 2&apos;; font-weight:600;&quot;&gt;It lets you share securely your friends, &lt;/span&gt;&lt;/p&gt;
@@ -10871,7 +10692,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+36"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10890,7 +10711,7 @@ p, li { white-space: pre-wrap; }
         <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;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:9pt; 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-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare Translations:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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;a href=&quot;http://retroshare.sourceforge.net/wiki/index.php/Translation&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; text-decoration: underline; color:#0000ff;&quot;&gt;http://retroshare.sourceforge.net/wiki/index.php/Translation&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
@@ -10964,7 +10785,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">表單</translation>
     </message>
     <message>
-        <location line="+288"/>
+        <location line="+279"/>
         <source>Add friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10974,7 +10795,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-254"/>
+        <location line="-247"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Share your RetroShare ID&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11002,7 +10823,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+87"/>
+        <location line="+80"/>
         <source>Did you receive a Retroshare ID from a friend?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11012,7 +10833,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/HomePage.cpp" line="+172"/>
+        <location filename="../gui/HomePage.cpp" line="+152"/>
         <source>Copy your Cert to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11022,7 +10843,7 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-86"/>
         <source>Send via Email</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11042,37 +10863,13 @@ private and secure decentralized communication platform.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+21"/>
-        <source>Include current local IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include current external IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include my DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Include all IPs history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;&lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,   you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;&lt;div align=&quot;center&quot;&gt;&lt;IMG width=&quot;%2&quot; height=&quot;%3&quot; src=&quot;:/images/network_map.png&quot; style=&quot;display: block; margin-left: auto; margin-right: auto; &quot;/&gt;&lt;/div&gt;&lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;&lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange   Retroshare ID with a dedicated Retroshare node, through which   you will be able to anonymously meet other people.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+70"/>
+        <location line="+8"/>
+        <location line="+90"/>
         <source>Include all your known IPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-109"/>
+        <location line="-83"/>
         <source>Use old certificate format</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11084,12 +10881,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+73"/>
         <source>Use new (short) certificate format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+133"/>
         <source>Your Retroshare certificate is copied to Clipboard, paste and send it to your friend via email or some other way</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11104,7 +10901,12 @@ new short format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="-183"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Welcome to Retroshare!&lt;/h1&gt;                            &lt;p&gt;You need to &lt;b&gt;make friends&lt;/b&gt;! After you create a network of friends or join an existing network,                            you&apos;ll be able to exchange files, chat, talk in forums, etc. &lt;/p&gt;                            &lt;div align=center&gt;                    &lt;IMG align=&quot;center&quot; width=&quot;%2&quot; src=&quot;:/images/network_map.png&quot;/&gt;                     &lt;/div&gt;                    &lt;p&gt;To do so, copy your Retroshare ID on this page and send it to friends, and add your friends&apos; Retroshare ID.&lt;/p&gt;                             &lt;p&gt;Another option is to search the internet for &quot;Retroshare chat servers&quot; (independently administrated). These servers allow you to exchange                             Retroshare ID with a dedicated Retroshare node, through which                            you will be able to anonymously meet other people.&lt;/p&gt; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+202"/>
         <source>Save as...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11369,14 +11171,14 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>IdDialog</name>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+177"/>
-        <location line="+103"/>
-        <location line="+1322"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+176"/>
+        <location line="+99"/>
+        <location line="+1361"/>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1255"/>
+        <location line="-1294"/>
         <source>Reputation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11386,12 +11188,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1376"/>
+        <location line="+1415"/>
         <source>Anonymous Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1390"/>
+        <location line="-1429"/>
         <source>Create new Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11401,7 +11203,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+249"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+237"/>
         <source>Persons</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11416,27 +11218,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+212"/>
+        <location line="+184"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+263"/>
+        <location line="+307"/>
         <source>Ban-option:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="+78"/>
         <source>Auto-Ban all identities signed by the same node</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="+24"/>
         <source>Friend votes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+358"/>
+        <location line="-225"/>
         <source>Positive votes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11452,39 +11254,29 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-291"/>
+        <location line="+68"/>
         <source>Created on :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-64"/>
-        <source>Auto-Ban profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+150"/>
+        <location line="+45"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;Your own opinion about an identity rules the visibility of that identity for yourself and your friend nodes. Your own opinion is shared among friends and used to compute a reputation score: If your opinion about an identity is neutral, the reputation score is the difference between friend&apos;s positive and negative opinions. If not, your own opinion gives the score.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;The overall score is used in chat lobbies, forums and channels to decide on the actions to take for each specific identity. When the overall score is lower than -1, the identity is banned, which prevents all messages and forums/channels authored by this identity to be forwarded, both ways. Some forums also have special anti-spam flags that require a non negative reputation level, making them more sensitive to bad opinions. Banned identities gradually lose their activity and eventually disappear (after 5 days).&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:9pt;&quot;&gt;You can change the thresholds and the time of inactivity to delete identities in preferences -&amp;gt; people. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+84"/>
-        <source>Edit Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+151"/>
+        <location line="+108"/>
         <source>Usage statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+37"/>
-        <location line="+48"/>
+        <location line="+43"/>
         <location filename="../gui/Identity/IdDialog.cpp" line="-67"/>
         <source>Circles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+17"/>
         <source>Circle name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11504,20 +11296,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+17"/>
         <location line="+3"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+2015"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="+1"/>
+        <location line="+9"/>
         <source>Delete identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+9"/>
         <source>Chat with this peer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11527,78 +11317,78 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-407"/>
+        <location line="-523"/>
         <source>Owner node ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-58"/>
+        <location line="+302"/>
         <source>Identity name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-587"/>
+        <location line="-741"/>
         <source>()</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+147"/>
+        <location line="+142"/>
         <source>Identity ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-31"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="+2019"/>
         <source>Send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="+319"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+291"/>
         <source>Identity info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+128"/>
+        <location line="+216"/>
         <source>Identity ID :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+14"/>
         <source>Owner node name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-569"/>
+        <location line="-580"/>
         <source>Create new...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+535"/>
+        <location line="+539"/>
         <source>Type:</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location line="+139"/>
+        <location line="-114"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="+176"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Average opinion of neighbor nodes about this identity. Negative is bad,&lt;/p&gt;&lt;p&gt;positive is good. Zero is neutral.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-7"/>
         <source>Your opinion:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+116"/>
+        <location line="+34"/>
         <source>Negative</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-405"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-402"/>
         <source>Neutral</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11609,17 +11399,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-283"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Overall reputation score, accounting for yours and your friends&apos;.&lt;/p&gt;&lt;p&gt;Negative is bad, positive is good. Zero is neutral. If the score is too low,&lt;/p&gt;&lt;p&gt;the identity is flagged as bad, and will be filtered out in forums, chat lobbies,&lt;/p&gt;&lt;p&gt;channels, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+189"/>
         <source>Overall:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1519"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1556"/>
         <source>Anonymous</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11634,24 +11424,24 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1085"/>
+        <location line="+1128"/>
         <source>This identity is owned by you</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1267"/>
-        <location line="+1431"/>
+        <location line="-1305"/>
+        <location line="+1465"/>
         <source>My own identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1421"/>
-        <location line="+1419"/>
+        <location line="-1457"/>
+        <location line="+1455"/>
         <source>My contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1325"/>
+        <location line="-1364"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11666,12 +11456,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,   receive feedback using the Retroshare built-in email system, post comments   after channel posts, chat using secured tunnels, etc.&lt;/p&gt;&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be   used to restrict the visibility to forums, channels, etc. &lt;/p&gt;&lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle   or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+268"/>
+        <location line="+359"/>
         <source>Other circles</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11681,7 +11466,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+39"/>
         <source>Circle ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11756,7 +11541,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+105"/>
+        <location line="+108"/>
         <source>Identity ID: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -11786,7 +11571,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+16"/>
         <source>Invited</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11801,7 +11586,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+187"/>
+        <location line="+190"/>
         <source>Edit Circle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11849,7 +11634,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+231"/>
+        <location line="+269"/>
         <source>
 This identity has a unsecure fingerprint (It&apos;s probably quite old).
 You should get rid of it now and use a new one.
@@ -11857,7 +11642,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+35"/>
         <location line="+232"/>
         <source>[Unknown node]</source>
         <translation type="unfinished"></translation>
@@ -11900,7 +11685,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+120"/>
+        <location line="+118"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11980,7 +11765,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+354"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11996,12 +11781,17 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1957"/>
+        <location line="-1991"/>
         <source>Banned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1498"/>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Identities&lt;/h1&gt;    			&lt;p&gt;In this tab you can create/edit &lt;b&gt;pseudo-anonymous identities&lt;/b&gt;, and &lt;b&gt;circles&lt;/b&gt;.&lt;/p&gt;                			&lt;p&gt;&lt;b&gt;Identities&lt;/b&gt; are used to securely identify your data: sign messages in chat lobbies, forum and channel posts,				receive feedback using the Retroshare built-in email system, post comments 				after channel posts, chat using secured tunnels, etc.&lt;/p&gt; 			&lt;p&gt;Identities can optionally be &lt;b&gt;signed&lt;/b&gt; by your Retroshare node&apos;s certificate.   			Signed identities are easier to trust but are easily linked to your node&apos;s IP address.&lt;/p&gt;  			&lt;p&gt;&lt;b&gt;Anonymous identities&lt;/b&gt; allow you to anonymously interact with other users. They cannot be   			spoofed, but noone can prove who really owns a given identity.&lt;/p&gt;                     &lt;p&gt;&lt;b&gt;Circles&lt;/b&gt; are groups of identities (anonymous or signed), that are shared at a distance over the network. They can be                 		used to restrict the visibility to forums, channels, etc. &lt;/p&gt;                     &lt;p&gt;An &lt;b&gt;circle&lt;/b&gt; can be restricted to another circle, thereby limiting its visibility to members of that circle                         or even self-restricted, meaning that it is only visible to invited members.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1472"/>
         <source> positive </source>
         <translation type="unfinished"></translation>
     </message>
@@ -12106,7 +11896,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+274"/>
         <source>Add to Contacts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12156,21 +11946,21 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-580"/>
-        <location line="+237"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-1959"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-642"/>
+        <location line="+227"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-1995"/>
         <location filename="../gui/Identity/IdDialog.h" line="+48"/>
         <source>People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+507"/>
+        <location line="+275"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-182"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-180"/>
         <source>Linked to neighbor nodes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12180,7 +11970,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1451"/>
+        <location line="+1490"/>
         <source>Linked to a friend Retroshare node</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12195,7 +11985,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+460"/>
+        <location line="+455"/>
         <source>Chat with this person</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12210,12 +12000,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-231"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="+147"/>
         <source>Last used:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-605"/>
         <source>+50 Known PGP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12235,12 +12025,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.ui" line="-354"/>
+        <location filename="../gui/Identity/IdDialog.ui" line="-495"/>
         <source>Owned by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-608"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-606"/>
         <source>Node name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12250,7 +12040,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+607"/>
+        <location line="+605"/>
         <source>Really delete?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12258,7 +12048,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>IdEditDialog</name>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.ui" line="+239"/>
+        <location filename="../gui/Identity/IdEditDialog.ui" line="+207"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12288,13 +12078,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+138"/>
-        <location line="+95"/>
-        <source>Use the mouse to zoom and adjust the image for your avatar. Hit Del to remove it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-84"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+136"/>
         <source>New identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12308,7 +12092,7 @@ These identities will soon be not supported anymore.</source>
         <location line="-12"/>
         <location line="+1"/>
         <location line="+1"/>
-        <location line="+73"/>
+        <location line="+64"/>
         <location line="+1"/>
         <location line="+1"/>
         <location line="+72"/>
@@ -12318,12 +12102,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-119"/>
-        <source>No avatar chosen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
+        <location line="-111"/>
         <location line="+2"/>
         <source>Edit identity</source>
         <translation type="unfinished"></translation>
@@ -12334,27 +12113,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+353"/>
-        <location line="+74"/>
+        <location line="+354"/>
+        <location line="+72"/>
         <source>Profile password needed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-67"/>
         <location line="+16"/>
         <location line="+3"/>
-        <location line="+55"/>
+        <location line="+53"/>
         <source>Identity creation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-74"/>
-        <location line="+74"/>
+        <location line="-72"/>
+        <location line="+72"/>
         <source>Cannot create an identity linked to your profile without your profile password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-62"/>
+        <location line="-60"/>
         <source>Identity creation success</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12374,7 +12153,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+60"/>
         <source>Identity update failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12384,18 +12163,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-410"/>
+        <location line="-409"/>
         <source>Error KeyID invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-179"/>
-        <location line="+141"/>
-        <source>No Avatar chosen. A default image will be automatically displayed from your new identity.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-107"/>
+        <location line="-133"/>
         <source>Import image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12405,7 +12178,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+216"/>
+        <location line="+7"/>
+        <source>Use the mouse to zoom and adjust the image for your avatar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+197"/>
         <source>Unknown GpgId</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12415,7 +12193,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-293"/>
+        <location line="-273"/>
         <source>Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12425,15 +12203,10 @@ These identities will soon be not supported anymore.</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location line="+182"/>
+        <location line="+179"/>
         <source>Choose image...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+7"/>
-        <source>Remove</source>
-        <translation type="unfinished">刪除</translation>
-    </message>
     <message>
         <location line="+36"/>
         <location line="+7"/>
@@ -12459,7 +12232,7 @@ These identities will soon be not supported anymore.</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+54"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12469,13 +12242,13 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="-210"/>
+        <location line="-196"/>
         <source>Your Avatar</source>
         <extracomment>Click here to change your avatar</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-156"/>
+        <location line="-153"/>
         <source>Linked to your profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12485,7 +12258,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Identity/IdEditDialog.cpp" line="+502"/>
+        <location filename="../gui/Identity/IdEditDialog.cpp" line="+485"/>
         <source>The nickname is too short. Please input at least %1 characters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12559,7 +12332,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+58"/>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+387"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="+389"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
@@ -12569,12 +12342,12 @@ These identities will soon be not supported anymore.</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-291"/>
+        <location filename="../gui/im_history/ImHistoryBrowser.cpp" line="-289"/>
         <source>%1 &apos;s Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+290"/>
+        <location line="+288"/>
         <source>Mark all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12597,34 +12370,18 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>ImageUtil</name>
     <message>
-        <location filename="../util/imageutil.cpp" line="+123"/>
-        <location line="+15"/>
+        <location filename="../util/imageutil.cpp" line="+60"/>
+        <location line="+7"/>
         <source>Save image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-7"/>
-        <source>Save Picture File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Pictures (*.png *.xpm *.jpg)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Cannot save the image, invalid filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-48"/>
-        <location line="+48"/>
+        <location line="+7"/>
         <source>Not an image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12642,32 +12399,27 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable RetroShare JSON API Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="+9"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-18"/>
+        <location line="+24"/>
         <source>Listen Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-21"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+7"/>
         <source>127.0.0.1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+11"/>
         <source>Token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12688,12 +12440,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <source>Authenticated Tokens:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Registered services:</source>
+        <source>Authenticated Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -12702,31 +12449,26 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/JsonApiPage.h" line="+44"/>
+        <location filename="../gui/settings/JsonApiPage.h" line="+42"/>
         <source>JSON API</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/settings/JsonApiPage.cc" line="+91"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;Retroshare provides a JSON API allowing other softwares to communicate with its core using token-controlled HTTP requests to http://localhost:[port].         Please refer to the Retroshare documentation for how to use this feature. &lt;/p&gt;        &lt;p&gt;Unless you know what you&apos;re doing, you shouldn&apos;t need to change anything in this page.        The web interface for instance will automatically register its own token to the JSON API which will be visible         in the list of authenticated tokens after you enable it.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LocalSharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+281"/>
-        <location line="+1010"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="+266"/>
+        <location line="+1007"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1008"/>
+        <location line="-1005"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+234"/>
+        <location line="+230"/>
         <source>Checking...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12736,7 +12478,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+650"/>
+        <location line="+651"/>
         <source>Recommend in a message to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12764,7 +12506,7 @@ These identities will soon be not supported anymore.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/MainWindow.ui" line="+143"/>
+        <location filename="../gui/MainWindow.ui" line="+138"/>
         <source>Add Friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12780,8 +12522,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="+649"/>
-        <location line="+59"/>
+        <location filename="../gui/MainWindow.cpp" line="+641"/>
         <source>Options</source>
         <translation>選項</translation>
     </message>
@@ -12802,7 +12543,7 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+9"/>
-        <location filename="../gui/MainWindow.cpp" line="-178"/>
+        <location filename="../gui/MainWindow.cpp" line="-119"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12813,12 +12554,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-316"/>
+        <location filename="../gui/MainWindow.cpp" line="-312"/>
         <source>RetroShare %1 a secure decentralized communication platform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+302"/>
+        <location line="+298"/>
         <source>Unfinished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12843,12 +12584,11 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+87"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-83"/>
+        <location line="+4"/>
         <source>Notify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12859,35 +12599,31 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+69"/>
         <source>Open Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-63"/>
-        <location line="+64"/>
+        <location line="+6"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-59"/>
+        <location line="+5"/>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+59"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-57"/>
-        <location line="+34"/>
+        <location line="+2"/>
         <source>Minimize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-33"/>
+        <location line="+1"/>
         <source>Maximize</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12902,12 +12638,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Close window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+127"/>
+        <location line="+94"/>
         <source>%1 new message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12937,7 +12668,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+367"/>
+        <location line="+365"/>
         <source>Do you really want to exit RetroShare ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12957,7 +12688,7 @@ These identities will soon be not supported anymore.</source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location line="+277"/>
+        <location line="+273"/>
         <source>Make sure this link has not been forged to drag you to a malicious website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13002,13 +12733,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="-970"/>
-        <location line="+64"/>
+        <location filename="../gui/MainWindow.cpp" line="-899"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-68"/>
+        <location line="-4"/>
         <source>Show web interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13023,7 +12753,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+635"/>
+        <location line="+568"/>
         <source>Really quit ?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13032,17 +12762,17 @@ These identities will soon be not supported anymore.</source>
     <name>MessageComposer</name>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+14"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+900"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+911"/>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1342"/>
+        <location line="+1328"/>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-973"/>
+        <location line="-942"/>
         <source>Paragraph</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13078,12 +12808,12 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+30"/>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+22"/>
         <source>Increase font size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13098,32 +12828,32 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+41"/>
         <source>Italic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+79"/>
         <source>Alignment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
+        <location line="-38"/>
         <source>Add an Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-105"/>
+        <location line="+67"/>
         <source>Sets text font to code style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-70"/>
+        <location line="+51"/>
         <source>Underline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-372"/>
+        <location line="-513"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13134,32 +12864,32 @@ These identities will soon be not supported anymore.</source>
     </message>
     <message>
         <location line="-82"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-500"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-541"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-129"/>
+        <location line="-135"/>
         <source>Address list:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+109"/>
         <source>Recommend this friend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+296"/>
+        <location line="+650"/>
         <source>Set Text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+13"/>
         <source>Set Text background color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+776"/>
+        <location line="+399"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13229,7 +12959,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-172"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-145"/>
         <source>Send To:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13269,7 +12999,7 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+307"/>
+        <location line="+280"/>
         <source>Hello,&lt;br&gt;I recommend a good friend of mine; you can trust them too when you trust me. &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13289,18 +13019,18 @@ These identities will soon be not supported anymore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+23"/>
         <source>Hi %1,&lt;br&gt;&lt;br&gt;%2 wants to be friends with you on RetroShare.&lt;br&gt;&lt;br&gt;Respond now:&lt;br&gt;%3&lt;br&gt;&lt;br&gt;Thanks,&lt;br&gt;The RetroShare Team</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <location line="+1808"/>
+        <location line="+46"/>
+        <location line="+1760"/>
         <source>Save Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1807"/>
+        <location line="-1759"/>
         <source>Message has not been Sent.
 Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
@@ -13311,17 +13041,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+492"/>
-        <source>Will not reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no point in replying to a notification message!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+887"/>
+        <location line="+1334"/>
         <source>Add to &quot;To&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13341,7 +13061,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-958"/>
+        <location line="-922"/>
         <source>Original Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13351,21 +13071,21 @@ Do you want to save message to draft box?</source>
         <translation>來自</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="-1272"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="-1246"/>
         <location filename="../gui/msgs/MessageComposer.cpp" line="+1"/>
-        <location line="+510"/>
+        <location line="+475"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="-13"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-507"/>
-        <location line="+508"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-472"/>
+        <location line="+473"/>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-505"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-470"/>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13380,7 +13100,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+152"/>
         <source>Re:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13390,30 +13110,30 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
-        <location line="+134"/>
-        <location line="+52"/>
+        <location line="+53"/>
+        <location line="+136"/>
+        <location line="+6"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-186"/>
+        <location line="-142"/>
         <source>Do you want to send the message without a subject ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+136"/>
         <source>Please insert at least one recipient.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/msgs/MessageComposer.ui" line="+26"/>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+112"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+119"/>
         <source>Bcc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="+37"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="+36"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -13528,13 +13248,13 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+283"/>
+        <location line="+282"/>
         <source>Open File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+0"/>
-        <location line="+24"/>
+        <location line="+23"/>
         <source>HTML-Files (*.htm *.html);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13554,7 +13274,7 @@ Do you want to save message to draft box?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="+49"/>
         <source>Message has not been Sent.
 Do you want to save message ?</source>
         <translation type="unfinished"></translation>
@@ -13575,7 +13295,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+243"/>
+        <location line="+242"/>
         <source>Hi,&lt;br&gt;I want to be friends with you on RetroShare.&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13605,18 +13325,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.ui" line="+852"/>
-        <location line="+181"/>
+        <location filename="../gui/msgs/MessageComposer.ui" line="+853"/>
+        <location line="+154"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-882"/>
+        <location line="-856"/>
         <source>From:</source>
         <translation>從：</translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageComposer.cpp" line="-2670"/>
+        <location filename="../gui/msgs/MessageComposer.cpp" line="-2635"/>
         <source>Bullet list (disc)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13656,13 +13376,13 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+351"/>
-        <location line="+2271"/>
+        <location line="+324"/>
+        <location line="+2263"/>
         <source>Thanks, &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1257"/>
+        <location line="-1252"/>
         <source>Distant identity:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13672,12 +13392,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-146"/>
+        <location line="-95"/>
         <source>Please create an identity to sign distant messages, or remove the distant peers from the destination list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+97"/>
         <source>Node name &amp; id:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13755,7 +13475,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/MessagePage.cpp" line="+49"/>
+        <location filename="../gui/settings/MessagePage.cpp" line="+48"/>
         <source>A new tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13765,7 +13485,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+161"/>
+        <location line="+136"/>
         <source>Edit Tag</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13788,7 +13508,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageToaster</name>
     <message>
-        <location filename="../gui/toaster/MessageToaster.cpp" line="+41"/>
+        <location filename="../gui/toaster/MessageToaster.cpp" line="+37"/>
         <source>Sub:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13796,7 +13516,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageUserNotify</name>
     <message>
-        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+44"/>
+        <location filename="../gui/msgs/MessageUserNotify.cpp" line="+36"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13824,7 +13544,7 @@ Do you want to save message ?</source>
 <context>
     <name>MessageWidget</name>
     <message>
-        <location filename="../gui/msgs/MessageWidget.ui" line="+695"/>
+        <location filename="../gui/msgs/MessageWidget.ui" line="+645"/>
         <source>Recommended Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13834,37 +13554,37 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-534"/>
+        <location line="-302"/>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+184"/>
+        <location line="+21"/>
         <source>From:</source>
         <translation>從：</translation>
     </message>
     <message>
-        <location line="-118"/>
+        <location line="-355"/>
         <source>To:</source>
         <translation>到：</translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="+21"/>
         <source>Cc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="-42"/>
         <source>Bcc:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-66"/>
+        <location line="+66"/>
         <source>Tags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-131"/>
+        <location line="+42"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13904,7 +13624,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+446"/>
+        <location line="+309"/>
         <source>Send Invite</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13956,7 +13676,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+79"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+78"/>
         <source>Confirm %1 as friend</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13966,12 +13686,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+76"/>
         <source>View source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+191"/>
+        <location line="+150"/>
         <source>No subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13981,22 +13701,17 @@ Do you want to save message ?</source>
         <translation>下載</translation>
     </message>
     <message>
-        <location line="+222"/>
+        <location line="+230"/>
         <source>You got an invite to make friend! You may accept this request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+4"/>
         <source>You got an invite to make friend! You may accept this request and send your own Certificate back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
-        <source>more</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+290"/>
+        <location line="+347"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14005,24 +13720,14 @@ Do you want to save message ?</source>
         <source>%1 (%2) </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+9"/>
-        <source>Show less</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Show more</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/msgs/MessageWidget.ui" line="-67"/>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="-600"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="-597"/>
         <source>Download all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+416"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+425"/>
         <source>Print Document</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14037,12 +13742,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-635"/>
+        <location line="-600"/>
         <source>Load images always for this message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+211"/>
+        <location line="+167"/>
         <source>Hide the attachment pane</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14064,6 +13769,10 @@ Do you want to save message ?</source>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Delete</source>
+        <translation type="vanished">刪除</translation>
+    </message>
     <message>
         <location line="+119"/>
         <source>Print</source>
@@ -14142,7 +13851,7 @@ Do you want to save message ?</source>
     <name>MessagesDialog</name>
     <message>
         <location filename="../gui/msgs/MessagesDialog.ui" line="+104"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+774"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+715"/>
         <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14152,16 +13861,20 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <source>Delete</source>
+        <translation type="vanished">刪除</translation>
+    </message>
+    <message>
+        <location line="+190"/>
         <location line="+3"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-575"/>
-        <location line="+47"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-521"/>
+        <location line="+42"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-152"/>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1139"/>
+        <location line="-153"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="+1076"/>
         <location line="+10"/>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
@@ -14191,17 +13904,17 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
+        <location line="+89"/>
         <source>Total Inbox:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-41"/>
+        <location line="-36"/>
         <source>Quick View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+176"/>
         <location line="+3"/>
         <source>Print...</source>
         <translation type="unfinished"></translation>
@@ -14232,7 +13945,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1258"/>
+        <location filename="../gui/msgs/MessagesDialog.cpp" line="-1189"/>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14242,7 +13955,7 @@ Do you want to save message ?</source>
         <translation>來自</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
@@ -14252,7 +13965,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-4"/>
+        <location line="-3"/>
         <source>Search Subject</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14261,16 +13974,6 @@ Do you want to save message ?</source>
         <source>Search From</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Search To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Search Date</source>
@@ -14297,12 +14000,12 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;&lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;&lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages   are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;&lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt;&lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,   or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback   to a channel&apos;s owner.&lt;/p&gt;</source>
+        <location line="+63"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Messages&lt;/h1&gt;                          &lt;p&gt;Retroshare has its own internal email system. You can send/receive emails to/from connected friend nodes.&lt;/p&gt;  &lt;p&gt;It is also possible to send messages to other people&apos;s Identities using the global routing system. These messages     are always encrypted and signed, and are relayed by intermediate nodes until they reach their final destination. &lt;/p&gt;    &lt;p&gt;Distant messages stay into your Outbox until an acknowledgement of receipt has been received.&lt;/p&gt; &lt;p&gt;Generally, you may use messages to recommend files to your friends by pasting file links,  or recommend friend nodes to other friend nodes, in order to strengthen your network, or send feedback  to a channel&apos;s owner.&lt;/p&gt;                    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+197"/>
         <source>Starred</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14378,7 +14081,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <source>Show in People</source>
+        <source>Show author in People</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -14392,7 +14095,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+68"/>
+        <location line="+46"/>
         <source>No message using %1 tag available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14407,28 +14110,18 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+204"/>
-        <source>Deletion is not recommended</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Messages in this box are automatically deleted when received. Manually deleting a message does not guaranty that the message will not be delivered. Messages that cannot be delivered will however stay here indefinitly. Do you want to proceed and delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+239"/>
+        <location line="+451"/>
         <location line="+8"/>
         <source>Drafts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+223"/>
+        <location line="+222"/>
         <source>No Box selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-303"/>
+        <location line="-302"/>
         <location line="+4"/>
         <location line="+4"/>
         <location line="+4"/>
@@ -14463,17 +14156,7 @@ Do you want to save message ?</source>
 <context>
     <name>MimeTextEdit</name>
     <message>
-        <location filename="../gui/common/MimeTextEdit.cpp" line="+253"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
+        <location filename="../gui/common/MimeTextEdit.cpp" line="+250"/>
         <source>Paste as plain text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14527,7 +14210,7 @@ Do you want to save message ?</source>
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/MsgItem.cpp" line="+312"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="+255"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -14537,7 +14220,7 @@ Do you want to save message ?</source>
         <translation>刪除項目</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/MsgItem.cpp" line="-136"/>
+        <location filename="../gui/feeds/MsgItem.cpp" line="-133"/>
         <source>from</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14572,7 +14255,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+87"/>
         <source>Hide</source>
         <translation>隱藏</translation>
     </message>
@@ -14713,7 +14396,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+41"/>
         <source>Remove unused keys...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14723,7 +14406,7 @@ Do you want to save message ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+32"/>
         <source>Clean keyring</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14737,13 +14420,7 @@ Notes: Your old keyring will be backed up.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>You have selected %1 accepted peers among others,
- Are you sure you want to un-friend them?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+26"/>
+        <location line="+31"/>
         <location line="+19"/>
         <source>Keyring info</source>
         <translation type="unfinished"></translation>
@@ -14776,13 +14453,18 @@ For security, your keyring was previously backed-up to file
         <source>Data inconsistency in the keyring. This is most probably a bug. Please contact the developers.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="-84"/>
+        <source>Export/create a new node</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../gui/NetworkDialog.ui" line="-103"/>
         <source>Trusted keys only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NetworkDialog.cpp" line="-133"/>
+        <location filename="../gui/NetworkDialog.cpp" line="-38"/>
         <source>Search name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14792,12 +14474,12 @@ For security, your keyring was previously backed-up to file
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+39"/>
         <source>Profile details...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+108"/>
+        <location line="+86"/>
         <source>Key removal has failed. Your keyring remains intact.
 
 Reported error:</source>
@@ -14830,7 +14512,7 @@ Reported error:</source>
 <context>
     <name>NewFriendList</name>
     <message>
-        <location filename="../gui/common/NewFriendList.ui" line="+83"/>
+        <location filename="../gui/common/NewFriendList.ui" line="+78"/>
         <source>Offline Friends</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14851,7 +14533,7 @@ Reported error:</source>
     </message>
     <message>
         <location line="+8"/>
-        <location filename="../gui/common/NewFriendList.cpp" line="+690"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="+650"/>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14881,19 +14563,19 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/common/NewFriendList.cpp" line="-496"/>
-        <location line="+28"/>
+        <location filename="../gui/common/NewFriendList.cpp" line="-473"/>
+        <location line="+24"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <location line="+144"/>
+        <location line="+162"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-144"/>
+        <location line="-162"/>
         <source>Search ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14903,12 +14585,12 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+103"/>
         <source>Show Items</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+43"/>
         <source>Last contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14918,7 +14600,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+214"/>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15033,7 +14715,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+236"/>
+        <location line="+235"/>
         <source>Do you want to remove this node?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15043,7 +14725,7 @@ Reported error:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+235"/>
+        <location line="+193"/>
         <location line="+18"/>
         <source>Done!</source>
         <translation type="unfinished"></translation>
@@ -15150,7 +14832,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NewsFeed</name>
     <message>
-        <location filename="../gui/NewsFeed.ui" line="+79"/>
+        <location filename="../gui/NewsFeed.ui" line="+72"/>
         <source>Activity Stream</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15165,7 +14847,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.cpp" line="+104"/>
+        <location filename="../gui/NewsFeed.cpp" line="+103"/>
         <source>Newest on top</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15175,12 +14857,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;&lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.   This gives you a summary of the activity of your friends.   You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;&lt;p&gt;The various events shown are:   &lt;ul&gt;    &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;    &lt;li&gt;Circle membership requests and invites&lt;/li&gt;    &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;    &lt;li&gt;Channel and Board comments&lt;/li&gt;    &lt;li&gt;New Mail messages&lt;/li&gt;    &lt;li&gt;Private messages from your friends&lt;/li&gt;   &lt;/ul&gt; &lt;/p&gt;</source>
+        <location line="+10"/>
+        <source> &lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Activity Feed&lt;/h1&gt;                                                             &lt;p&gt;The Activity Feed displays the last events on your network, sorted by the time you received them.                   This gives you a summary of the activity of your friends.                                                          You can configure which events to show by pressing on &lt;b&gt;Options&lt;/b&gt;. &lt;/p&gt;                                         &lt;p&gt;The various events shown are:                                                                                   &lt;ul&gt;                                                                                                            &lt;li&gt;Connection attempts (useful to make friends with new people and control who&apos;s trying to reach you)&lt;/li&gt;    &lt;li&gt;Channel, Forum and Board posts&lt;/li&gt;                                                                               &lt;li&gt;Circle membership requests and invites&lt;/li&gt;                                                                               &lt;li&gt;New Channels, Forums and Boards you can subscribe to&lt;/li&gt;                                                          &lt;li&gt;Channel and Board comments&lt;/li&gt;                                                                    &lt;li&gt;New Mail messages&lt;/li&gt;                                                                    &lt;li&gt;Private messages from your friends&lt;/li&gt;                                                                    &lt;/ul&gt; &lt;/p&gt;                                                                                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/NewsFeed.h" line="+71"/>
+        <location filename="../gui/NewsFeed.h" line="+72"/>
         <source>Activity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15409,6 +15091,10 @@ at least one peer was not added to a group</source>
         <source>Disable All Toaster temporarily</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Feed</source>
+        <translation type="vanished">訂閱</translation>
+    </message>
     <message>
         <location line="+229"/>
         <source>Systray</source>
@@ -15418,7 +15104,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>NotifyQt</name>
     <message>
-        <location filename="../gui/notifyqt.cpp" line="+229"/>
+        <location filename="../gui/notifyqt.cpp" line="+228"/>
         <source>Passphrase required</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15438,12 +15124,12 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+0"/>
         <source>Please enter your Retroshare passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
+        <location line="+33"/>
         <source>Unregistered plugin/executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15458,7 +15144,7 @@ at least one peer was not added to a group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+440"/>
+        <location line="+452"/>
         <source>Test</source>
         <translation>測試</translation>
     </message>
@@ -15469,19 +15155,17 @@ at least one peer was not added to a group</source>
     </message>
     <message>
         <location line="+17"/>
-        <location line="+296"/>
         <source>Unknown title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-472"/>
+        <location line="-176"/>
         <location line="+176"/>
-        <location line="+296"/>
         <source>Encrypted message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-756"/>
+        <location line="-472"/>
         <source>For the chat lobbies to work properly, the time of your computer needs to be correct. Please check that this is the case (A possible time shift of several minutes was detected with your friends).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15489,7 +15173,7 @@ at least one peer was not added to a group</source>
 <context>
     <name>OnlineToaster</name>
     <message>
-        <location filename="../gui/toaster/OnlineToaster.ui" line="+158"/>
+        <location filename="../gui/toaster/OnlineToaster.ui" line="+133"/>
         <source>Friend Online</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15628,12 +15312,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+41"/>
-        <source>Friend options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location line="+47"/>
         <source>These options apply to all nodes of the profile:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15678,7 +15357,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Options</source>
+        <translation type="unfinished">選項</translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you&apos;re downloading the file.&lt;/p&gt;&lt;p align=&quot;justify&quot;&gt;To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend&apos;s file list. This setting is applied to all locations of the same node.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15724,21 +15408,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+133"/>
-        <location line="+142"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+131"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-181"/>
-        <location line="+142"/>
+        <location line="-178"/>
+        <location line="+139"/>
         <location line="+40"/>
         <source>Error : cannot get peer details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-174"/>
+        <location line="-171"/>
         <source>The supplied key algorithm is not supported by RetroShare
 (Only RSA keys are supported at the moment)</source>
         <translation type="unfinished"></translation>
@@ -15756,7 +15440,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+57"/>
+        <location line="+54"/>
         <source>The trust level is a way to express your own trust in this key. It is not used by the software nor shared, but can be useful to you in order to remember good/bad keys.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15832,12 +15516,12 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
     </message>
     <message>
         <location filename="../gui/connect/PGPKeyDialog.ui" line="-463"/>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-159"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="-156"/>
         <source>Retroshare profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+109"/>
+        <location filename="../gui/connect/PGPKeyDialog.cpp" line="+108"/>
         <source>This is your own PGP key, and it is signed by :</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15863,7 +15547,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
 <context>
     <name>PeerItem</name>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="+118"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="+188"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15884,7 +15568,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>刪除項目</translation>
     </message>
     <message>
-        <location line="+110"/>
+        <location line="+29"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
@@ -15924,7 +15608,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
+        <location line="+111"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15982,7 +15666,7 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation>隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PeerItem.ui" line="-431"/>
+        <location filename="../gui/feeds/PeerItem.ui" line="-342"/>
         <source>Send Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16149,6 +15833,13 @@ Warning: In your File-Transfer option, you select allow direct download to No.</
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PhotoCommentItem</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">表單</translation>
+    </message>
+</context>
 <context>
     <name>PhotoDialog</name>
     <message>
@@ -16300,17 +15991,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+65"/>
+        <location line="+60"/>
         <source>My Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Subscribed Albums</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+26"/>
         <source>Shared Albums</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16339,7 +16030,7 @@ requesting to edit it!</source>
 <context>
     <name>PhotoSlideShow</name>
     <message>
-        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+33"/>
+        <location filename="../gui/PhotoShare/PhotoSlideShow.ui" line="+28"/>
         <source>Album Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16398,19 +16089,19 @@ requesting to edit it!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+18"/>
-        <location line="+112"/>
+        <location line="+17"/>
+        <location line="+109"/>
         <location line="+13"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-45"/>
+        <location line="-42"/>
         <source>Posted by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+55"/>
         <source>ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16446,12 +16137,12 @@ requesting to edit it!</source>
 <context>
     <name>PluginItem</name>
     <message>
-        <location filename="../gui/settings/PluginItem.ui" line="+95"/>
+        <location filename="../gui/settings/PluginItem.ui" line="+80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+51"/>
         <source>Show more details about this plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16662,27 +16353,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/chat/PopupChatWindow.cpp" line="+105"/>
-        <source>Ban this person (Sets negative opinion)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give neutral opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Give positive opinion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/chat/PopupChatWindow.cpp" line="+117"/>
         <source>Choose window color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+5"/>
         <location line="+2"/>
         <source>Dock window</source>
         <translation type="unfinished"></translation>
@@ -16735,7 +16411,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">新建</translation>
     </message>
     <message>
-        <location line="+61"/>
+        <location line="+64"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16755,8 +16431,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="+305"/>
+        <location line="+35"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="+307"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16781,13 +16457,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedCardView.cpp" line="-246"/>
-        <location line="+251"/>
+        <location filename="../gui/Posted/PostedCardView.cpp" line="-248"/>
+        <location line="+253"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-247"/>
+        <location line="-249"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -16815,12 +16491,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedCreatePostDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+69"/>
+        <location filename="../gui/Posted/PostedCreatePostDialog.cpp" line="+62"/>
         <source>Create a new Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+85"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16835,22 +16511,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
-        <source>Error while creating post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>An error occurred while creating the post.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+31"/>
         <source>Load Picture File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <location line="+3"/>
         <source>Post image</source>
         <translation type="unfinished"></translation>
@@ -16866,17 +16532,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
-        <source>No clipboard image found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>There is no image data in the clipboard to paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+51"/>
+        <location line="+75"/>
         <source>Close this window?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16886,7 +16542,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="-173"/>
         <source>Please add a Title</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16906,22 +16562,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+30"/>
+        <location line="+17"/>
         <source>Post size is limited to 32 KB, pictures will be downscaled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Paste image from clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Paste Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+48"/>
+        <location line="+64"/>
         <source>Remove image</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16936,7 +16582,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+28"/>
         <location line="+28"/>
         <source>Post</source>
         <translation type="unfinished"></translation>
@@ -16947,7 +16593,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+166"/>
+        <location line="+134"/>
         <source>You are submitting a post. The key to a successful submission is interesting content and a descriptive title.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16957,7 +16603,7 @@ p, li { white-space: pre-wrap; }
         <translation>標題</translation>
     </message>
     <message>
-        <location line="-180"/>
+        <location line="-148"/>
         <source>Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16965,12 +16611,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedDialog.cpp" line="+101"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;&lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and   channels&lt;/p&gt;&lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to   enlight important links.&lt;/p&gt;&lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;&lt;p&gt;Boards are kept for %2 days, and sync-ed over the last %3 days, unless you change this.&lt;/p&gt;</source>
+        <location filename="../gui/Posted/PostedDialog.cpp" line="+98"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;32&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Boards&lt;/h1&gt;        &lt;p&gt;The Boards service allows you to share images, blog posts &amp; internet links, that spread among Retroshare nodes like forums and 	 channels&lt;/p&gt; 	 &lt;p&gt;Posts can be commented by subscribed users. A promotion system also gives the opportunity to  	 enlight important links.&lt;/p&gt;      &lt;p&gt;There is no restriction on which links are shared. Be careful when clicking on them.&lt;/p&gt;    &lt;p&gt;Boards are kept for %1 days, and sync-ed over the last %2 days, unless you change this.&lt;/p&gt;                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
+        <location line="+16"/>
         <location filename="../gui/Posted/PostedDialog.h" line="+40"/>
         <source>Boards</source>
         <translation type="unfinished"></translation>
@@ -17004,7 +16650,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupDialog</name>
     <message>
-        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+76"/>
+        <location filename="../gui/Posted/PostedGroupDialog.cpp" line="+75"/>
         <source>Create New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17042,17 +16688,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedGroupItem</name>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.ui" line="+225"/>
-        <source>Last activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+14"/>
-        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
+        <location filename="../gui/feeds/PostedGroupItem.ui" line="+202"/>
         <source>Subscribe to Posted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17068,7 +16704,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+20"/>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+220"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="+215"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -17083,17 +16719,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-155"/>
+        <location filename="../gui/feeds/PostedGroupItem.cpp" line="-151"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+100"/>
-        <source>Never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+19"/>
+        <location line="+115"/>
         <source>New Board</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17106,18 +16737,18 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>PostedItem</name>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="+135"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="+130"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+371"/>
-        <location filename="../gui/Posted/PostedItem.cpp" line="+630"/>
+        <location line="+368"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="+628"/>
         <source>Comments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-215"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-213"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17128,12 +16759,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+60"/>
-        <location line="+157"/>
+        <location line="+155"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-153"/>
+        <location line="-151"/>
         <source>Comments </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17143,7 +16774,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+78"/>
         <source>Click to view Picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17153,17 +16784,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.ui" line="-396"/>
+        <location filename="../gui/Posted/PostedItem.ui" line="-388"/>
         <source>Vote up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+42"/>
         <source>Vote down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+431"/>
+        <location line="+428"/>
         <source>Set as read and remove item</source>
         <translation>設置為已讀并刪除項目</translation>
     </message>
@@ -17173,7 +16804,7 @@ p, li { white-space: pre-wrap; }
         <translation>新建</translation>
     </message>
     <message>
-        <location line="-203"/>
+        <location line="-202"/>
         <source>New Comment:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17183,7 +16814,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+38"/>
+        <location line="+37"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17224,11 +16855,30 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedItem.cpp" line="-342"/>
+        <location filename="../gui/Posted/PostedItem.cpp" line="-340"/>
         <source>Loading</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PostedListWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="vanished">表單</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="vanished">新建</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="vanished">下一個</translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="vanished">前一個</translation>
+    </message>
+</context>
 <context>
     <name>PostedListWidgetWithModel</name>
     <message>
@@ -17247,17 +16897,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Maximum number of data items (including posts, comments, votes) across friend nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Items (at friends):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+118"/>
+        <location line="+164"/>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17267,15 +16907,15 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-124"/>
+        <location line="-121"/>
         <location line="+10"/>
-        <location line="+88"/>
+        <location line="+85"/>
         <location line="+46"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-69"/>
+        <location line="-66"/>
         <source>Distribution:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17285,42 +16925,42 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+101"/>
+        <location line="+98"/>
         <source>Created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+91"/>
+        <location line="+88"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-137"/>
+        <location line="-134"/>
         <source>Popularity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-29"/>
+        <location line="-95"/>
+        <source>Contributions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+69"/>
         <source>Sync period:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <source>Number of subscribed friend nodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+166"/>
+        <location line="+186"/>
         <source>Posts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
+        <location line="+33"/>
         <source>Create Post</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
+        <location line="+23"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:&apos;-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol&apos;; font-size:14pt; color:#24292e; background-color:#ffffff;&quot;&gt;Select sorting&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17340,7 +16980,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
+        <location line="+28"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17370,17 +17010,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+266"/>
+        <location filename="../gui/Posted/PostedListWidgetWithModel.cpp" line="+252"/>
         <source>No files in this post, or no post selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+31"/>
         <source>No posts available in this board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+80"/>
+        <location line="+39"/>
         <source>Click to switch to card view</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17395,17 +17035,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-65"/>
+        <location line="+67"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Copy http Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
+        <location line="+1"/>
         <source>Show author in People tab</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17415,31 +17050,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">編輯</translation>
     </message>
     <message>
-        <location line="+127"/>
-        <location line="+32"/>
+        <location line="+31"/>
         <source>information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>The Retrohare link was copied to your clipboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
-        <location line="+32"/>
+        <location line="+4"/>
         <source>Link creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
-        <location line="+32"/>
+        <location line="+0"/>
         <source>Link could not be created: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
+        <location line="+395"/>
         <source>[No name]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17454,7 +17085,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Never</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17528,16 +17159,6 @@ p, li { white-space: pre-wrap; }
         <source>No Channel Selected</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+67"/>
-        <source>Could not vote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Error occured while voting: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PostedPage</name>
@@ -17627,16 +17248,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+40"/>
+        <location line="+31"/>
         <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;Sans Serif&apos;; font-size:9pt; 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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Ubuntu&apos;; font-size:11pt;&quot;&gt;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; 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;Select a Retroshare node key from the list below to be used on another computer, and press &amp;quot;Export selected key.&amp;quot;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;To create a new location on a different computer,  select the identity manager in the login window. From there you can import the key file and create a new location for that key. &lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&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;Creating a new node with the same key allows your friend nodes to accept you automatically.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -17744,7 +17365,7 @@ and use the import button to load it</source>
 <context>
     <name>ProfileWidget</name>
     <message>
-        <location filename="../gui/profile/ProfileWidget.ui" line="+56"/>
+        <location filename="../gui/profile/ProfileWidget.ui" line="+38"/>
         <location line="+3"/>
         <source>Edit status message</source>
         <translation type="unfinished"></translation>
@@ -17760,7 +17381,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+84"/>
         <source>Public Information</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17795,12 +17416,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+69"/>
         <source>Other Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+46"/>
+        <location line="+45"/>
         <source>My Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17844,27 +17465,27 @@ and use the import button to load it</source>
 <context>
     <name>PulseAddDialog</name>
     <message>
-        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+376"/>
+        <location filename="../gui/TheWire/PulseAddDialog.ui" line="+362"/>
         <source>Add to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+7"/>
         <source>Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="-17"/>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-308"/>
+        <location line="-262"/>
         <source>GroupLabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-25"/>
+        <location line="-20"/>
         <source>IDLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17874,12 +17495,12 @@ and use the import button to load it</source>
         <translation type="unfinished">從：</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+46"/>
         <source>Head</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+58"/>
+        <location line="+64"/>
         <source>Head Shot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17909,13 +17530,13 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
-        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+172"/>
+        <location line="+32"/>
+        <location filename="../gui/TheWire/PulseAddDialog.cpp" line="+134"/>
         <source>Whats happening?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+28"/>
         <location line="+16"/>
         <location line="+16"/>
         <location line="+16"/>
@@ -17927,22 +17548,12 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+10"/>
-        <source>Remove all images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
+        <location line="+43"/>
         <source>Clear Display As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
-        <source>Add Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+36"/>
+        <location line="+47"/>
         <source>Post </source>
         <translation type="unfinished"></translation>
     </message>
@@ -17957,7 +17568,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+64"/>
+        <location line="+61"/>
         <source>Reply to Pulse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17972,24 +17583,34 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+5"/>
+        <location line="+4"/>
         <source>Like Pulse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+357"/>
+        <location line="+307"/>
         <source>Hide Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
+        <location line="+5"/>
         <source>Add Pictures</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PulseItem</name>
     <message>
-        <location line="+8"/>
-        <source>Load Picture File</source>
-        <translation type="unfinished"></translation>
+        <source>From</source>
+        <translation type="vanished">來自</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="vanished">日期</translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
     </message>
 </context>
 <context>
@@ -18000,7 +17621,7 @@ and use the import button to load it</source>
         <translation type="unfinished">表單</translation>
     </message>
     <message>
-        <location line="+77"/>
+        <location line="+65"/>
         <location line="+19"/>
         <location line="+19"/>
         <location line="+19"/>
@@ -18019,7 +17640,7 @@ and use the import button to load it</source>
 <context>
     <name>PulseReply</name>
     <message>
-        <location filename="../gui/TheWire/PulseReply.ui" line="+116"/>
+        <location filename="../gui/TheWire/PulseReply.ui" line="+101"/>
         <source>icn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18029,7 +17650,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+49"/>
+        <location line="+46"/>
         <source>REPLY</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18056,7 +17677,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18066,7 +17687,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18086,7 +17707,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;Replying to @sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18202,7 +17823,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+63"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18210,42 +17831,37 @@ and use the import button to load it</source>
 <context>
     <name>PulseViewGroup</name>
     <message>
-        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+104"/>
+        <location filename="../gui/TheWire/PulseViewGroup.ui" line="+83"/>
         <source>headshot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+63"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#555753;&quot;&gt;@sidler_here&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-35"/>
+        <location line="+19"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sidler&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+136"/>
+        <location line="+59"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#2e3436;&quot;&gt;3:58 AM · Apr 13, 2020 ·&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-38"/>
+        <location line="+35"/>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Edit profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
+        <location line="+32"/>
         <source>Tag Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+82"/>
+        <location line="+34"/>
         <location line="+34"/>
         <location line="+34"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;1.2K&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -18277,7 +17893,7 @@ and use the import button to load it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+83"/>
+        <location line="+76"/>
         <source>FOLLOW</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18285,8 +17901,8 @@ and use the import button to load it</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../gui/MainWindow.cpp" line="+325"/>
-        <location filename="../gui/RetroShareLink.cpp" line="+1642"/>
+        <location filename="../gui/MainWindow.cpp" line="+321"/>
+        <location filename="../gui/RetroShareLink.cpp" line="+1628"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18554,12 +18170,12 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/msgs/MessageWidget.cpp" line="+45"/>
+        <location filename="../gui/msgs/MessageWidget.cpp" line="+44"/>
         <source>File Request canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="+269"/>
+        <location filename="../main.cpp" line="+271"/>
         <source>This version of RetroShare is using OpenPGP-SDK. As a side effect, it&apos;s not using the system shared PGP keyring, but has it&apos;s own keyring shared by all RetroShare instances. &lt;br&gt;&lt;br&gt;You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18590,7 +18206,7 @@ Characters &lt;b&gt;&quot;,|,/,\,&amp;lt;,&amp;gt;,*,?&lt;/b&gt; will be replace
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+32"/>
         <source>Cannot start Tor Manager!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18624,7 +18240,7 @@ The error reported is:&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../rshare.cpp" line="+962"/>
+        <location filename="../rshare.cpp" line="+953"/>
         <location line="+7"/>
         <source>Multiple instances</source>
         <translation type="unfinished"></translation>
@@ -18643,26 +18259,6 @@ The error reported is:&quot;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+5"/>
-        <source>Old certificate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>This node uses old certificate settings that are considered too weak by your current OpenSSL library version. You need to create a new node possibly using the same profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Tor error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Cannot run/configure Tor. Make sure it is installed on your system.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../gui/chat/PopupDistantChatDialog.cpp" line="-42"/>
         <source>Distant peer has closed the chat</source>
@@ -18742,7 +18338,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="-320"/>
+        <location filename="../main.cpp" line="-317"/>
         <source>You appear to have nodes associated to DSA keys:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18752,7 +18348,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ChatLobbyWidget.cpp" line="+228"/>
+        <location filename="../gui/ChatLobbyWidget.cpp" line="+231"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18762,7 +18358,7 @@ Reported error is:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+739"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+726"/>
         <source>Move IP %1 to whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18778,7 +18374,7 @@ Reported error is:
     </message>
     <message>
         <location filename="../gui/Identity/IdDetailsDialog.cpp" line="-287"/>
-        <location filename="../gui/Identity/IdDialog.cpp" line="-846"/>
+        <location filename="../gui/Identity/IdDialog.cpp" line="-878"/>
         <source>%1 seconds ago</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18845,7 +18441,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+766"/>
+        <location line="+765"/>
         <source>Join chat room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18873,7 +18469,7 @@ Security: no anonymous IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-83"/>
+        <location filename="../gui/gxsforums/GxsForumThreadWidget.cpp" line="-81"/>
         <source>Indefinitely</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19053,29 +18649,13 @@ Security: no anonymous IDs</source>
         <source>Ban list</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/FriendServerControl.cpp" line="+17"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
-        <source>Node</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/statistics/GxsIdStatistics.cpp" line="+1"/>
+        <location line="+1"/>
         <source>NXS</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19318,18 +18898,6 @@ Security: no anonymous IDs</source>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/feeds/ChannelsCommentsItem.cpp" line="-82"/>
-        <location line="+13"/>
-        <source>Missing channel post</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/gxs/GxsIdTreeWidgetItem.h" line="+113"/>
-        <location line="+17"/>
-        <source>[System]</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QuickStartWizard</name>
@@ -19469,7 +19037,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+5"/>
-        <location filename="../gui/QuickStartWizard.cpp" line="+306"/>
+        <location filename="../gui/QuickStartWizard.cpp" line="+303"/>
         <source>Network Wide</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19636,7 +19204,7 @@ p, li { white-space: pre-wrap; }
         <translation>表單</translation>
     </message>
     <message>
-        <location line="+146"/>
+        <location line="+119"/>
         <source>The loading of embedded images is blocked.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19649,7 +19217,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSPermissionMatrixWidget</name>
     <message>
-        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+470"/>
+        <location filename="../gui/settings/RSPermissionMatrixWidget.cpp" line="+466"/>
         <source>Allowed by default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19822,22 +19390,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTextBrowser</name>
     <message>
-        <location filename="../gui/common/RSTextBrowser.cpp" line="+293"/>
+        <location filename="../gui/common/RSTextBrowser.cpp" line="+309"/>
         <source>View &amp;Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>Save image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+27"/>
+        <location line="+17"/>
         <source>Document source</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19845,12 +19403,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>RSTreeWidget</name>
     <message>
-        <location filename="../gui/common/RSTreeWidget.cpp" line="+272"/>
+        <location filename="../gui/common/RSTreeWidget.cpp" line="+270"/>
         <source>Tree View Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+14"/>
         <source>Show Header</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20538,7 +20096,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsDownloadListModel</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+262"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+261"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -20659,7 +20217,7 @@ If you believe it is correct, remove the corresponding line from the file and re
 <context>
     <name>RsFriendListModel</name>
     <message>
-        <location filename="../gui/common/FriendListModel.cpp" line="+350"/>
+        <location filename="../gui/common/FriendListModel.cpp" line="+344"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20679,7 +20237,7 @@ If you believe it is correct, remove the corresponding line from the file and re
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+739"/>
+        <location line="+708"/>
         <source>Profile ID </source>
         <translation type="unfinished"></translation>
     </message>
@@ -20735,7 +20293,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+99"/>
+        <location line="+96"/>
         <source>[ ... Redacted message ... ]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20749,6 +20307,11 @@ prevents the message to be forwarded to your friends.</source>
         <source>[Unknown]</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+186"/>
+        <source>[ ... Missing Message ... ]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RsMessageModel</name>
@@ -20762,11 +20325,6 @@ prevents the message to be forwarded to your friends.</source>
         <source>From</source>
         <translation type="unfinished">來自</translation>
     </message>
-    <message>
-        <location line="+1"/>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location line="+1"/>
         <source>Subject</source>
@@ -20789,17 +20347,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by read status</source>
+        <source>Click to sort by read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+1"/>
-        <source>Click to sort by author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Click to sort by destination</source>
+        <source>Click to sort by from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -20823,9 +20376,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+333"/>
-        <location line="+14"/>
-        <location line="+17"/>
+        <location line="+311"/>
         <source>[Notification]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20846,7 +20397,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>Rshare</name>
     <message>
-        <location filename="../rshare.cpp" line="-541"/>
+        <location filename="../rshare.cpp" line="-525"/>
         <source>Resets ALL stored RetroShare settings.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20907,7 +20458,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+95"/>
+        <location line="+94"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20928,7 +20479,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-425"/>
+        <location line="-424"/>
         <source>opmode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20958,7 +20509,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+104"/>
+        <location line="+103"/>
         <source>Invalid language code specified:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -20976,7 +20527,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>RshareSettings</name>
     <message>
-        <location filename="../gui/settings/rsharesettings.cpp" line="+871"/>
+        <location filename="../gui/settings/rsharesettings.cpp" line="+861"/>
         <location line="+14"/>
         <source>Registry Access Error. Maybe you need Administrator right.</source>
         <translation type="unfinished"></translation>
@@ -20993,12 +20544,12 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SearchDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SearchDialog.ui" line="+88"/>
         <source>Enter a keyword here (at least 3 char long)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+13"/>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21059,7 +20610,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+62"/>
+        <location line="+59"/>
         <source>KeyWords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21074,7 +20625,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+31"/>
+        <location line="+28"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21174,23 +20725,23 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+214"/>
+        <location filename="../gui/FileTransfer/SearchDialog.cpp" line="+202"/>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+148"/>
+        <location line="+135"/>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
         <location line="+3"/>
-        <location line="+345"/>
+        <location line="+346"/>
         <source>Copy RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-345"/>
         <source>Send RetroShare Link</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21200,7 +20751,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+85"/>
+        <location line="+86"/>
         <source>Download Notice</source>
         <translation>下載</translation>
     </message>
@@ -21237,7 +20788,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+370"/>
+        <location line="+369"/>
         <location line="+69"/>
         <source>Folder</source>
         <translation>文件夾</translation>
@@ -21248,17 +20799,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+194"/>
+        <location line="+192"/>
         <source>New RetroShare Link(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1165"/>
+        <location line="-1163"/>
         <source>Open Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-270"/>
+        <location line="-258"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21278,7 +20829,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+251"/>
+        <location line="+239"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21286,7 +20837,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityIpItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="+226"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="+98"/>
         <source>Peer details</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21302,22 +20853,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation>刪除項目</translation>
     </message>
     <message>
-        <location line="-196"/>
+        <location line="+47"/>
         <source>IP address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+221"/>
+        <location line="+96"/>
         <source>Peer ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+45"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="+13"/>
         <source>Peer Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21334,7 +20885,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation>隱藏</translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-224"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-128"/>
         <source>but reported:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21359,8 +20910,8 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityIpItem.ui" line="-112"/>
-        <location line="+99"/>
+        <location filename="../gui/feeds/SecurityIpItem.ui" line="-227"/>
+        <location line="+214"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This warning is here to protect you against traffic forwarding attacks. In such a case, the friend you&apos;re connected to will not see your external IP, but the attacker&apos;s IP. &lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;However, if you just changed IPs for some reason (some ISPs regularly force change IPs) this warning just tells you that a friend connected to the new IP before Retroshare figured out the IP changed. Nothing&apos;s wrong in this case.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can easily suppress false warnings by white-listing your own IPs (e.g. the range of your ISP), or by completely disabling these warnings in Options-&amp;gt;Notify-&amp;gt;News Feed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21368,7 +20919,7 @@ prevents the message to be forwarded to your friends.</source>
 <context>
     <name>SecurityItem</name>
     <message>
-        <location filename="../gui/feeds/SecurityItem.ui" line="+142"/>
+        <location filename="../gui/feeds/SecurityItem.ui" line="+134"/>
         <source>wants to be friend with you on RetroShare</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21399,7 +20950,7 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="+81"/>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="+317"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="+306"/>
         <source>Expand</source>
         <translation>展開</translation>
     </message>
@@ -21444,12 +20995,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+115"/>
+        <location line="+107"/>
         <source>Write Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/feeds/SecurityItem.cpp" line="-212"/>
+        <location filename="../gui/feeds/SecurityItem.cpp" line="-201"/>
         <source>Connect Attempt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21469,12 +21020,17 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
+        <location line="+27"/>
         <source>Unknown Security Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+44"/>
+        <location line="+42"/>
+        <source>A unknown peer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+2"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
@@ -21484,17 +21040,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>SSL request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+7"/>
-        <source>An unknown peer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+88"/>
+        <location line="+109"/>
         <source>Hide</source>
         <translation>隱藏</translation>
     </message>
@@ -21504,7 +21050,7 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-212"/>
+        <location line="-201"/>
         <source>Certificate has wrong signature!! This peer is not who he claims to be.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21514,12 +21060,12 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Certificate caused an internal error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-16"/>
+        <location line="-15"/>
         <source>Peer/node not in friendlist (PGP id=</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21578,12 +21124,12 @@ prevents the message to be forwarded to your friends.</source>
     </message>
     <message>
         <location line="-178"/>
-        <location line="+955"/>
+        <location line="+705"/>
         <source>Local Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-962"/>
+        <location line="-712"/>
         <source>NAT</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21604,22 +21150,22 @@ prevents the message to be forwarded to your friends.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+137"/>
+        <location line="+138"/>
         <source>Local network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
+        <location line="-33"/>
         <source>External ip address finder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+93"/>
+        <location line="+94"/>
         <source>UPnP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+314"/>
+        <location line="+69"/>
         <source>Known / Previous IPs:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21632,16 +21178,21 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-608"/>
-        <location line="+219"/>
-        <location line="+1711"/>
+        <location line="+6"/>
+        <source>Allow RetroShare to ask my ip to these websites:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-361"/>
+        <location line="+201"/>
+        <location line="+1476"/>
         <location line="+44"/>
         <location line="+44"/>
         <source>kB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1992"/>
+        <location line="-1739"/>
         <source>Acceptable ports range from 10 to 65535. Normally Ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21651,46 +21202,23 @@ behind a firewall or a VPN.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+508"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+485"/>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-90"/>
+        <location line="-89"/>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1032"/>
+        <location line="-1013"/>
         <location line="+1"/>
         <source>Tor has been automatically configured by Retroshare. You shouldn&apos;t need to change anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+825"/>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>external</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>
-
-List of found external IP:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+197"/>
+        <location line="+1013"/>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21700,7 +21228,7 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+47"/>
+        <location line="+46"/>
         <source>I2P Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21725,95 +21253,37 @@ List of found external IP:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+119"/>
-        <location line="+18"/>
-        <location line="+15"/>
+        <location line="+118"/>
+        <location line="+14"/>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-10"/>
-        <location line="+15"/>
+        <location line="+5"/>
         <source>I2P proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+8"/>
-        <source>SAMv3 is running and accessible</source>
+        <location line="+9"/>
+        <source>BOB is running and accessible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>SAMv3 is not accessible! Is i2p running and SAM enabled?</source>
+        <source>BOB is not accessible! Is it running?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+318"/>
-        <source>Your key uses the following algorithms: %1 and %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <location line="+120"/>
-        <source>unkown key type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-94"/>
-        <source>RetroShare uses SAMv3 to set up a %1 tunnel at %2:%3
-(id: %4)
+        <location line="+319"/>
+        <source>RetroShare uses BOB to set up a %1 tunnel at %2:%3 (named %4)
 
-When changing options use the buttons at the bottom to restart SAMv3.
+When changing options (e.g. port) use the buttons at the bottom to restart BOB.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Offline, no SAM session is established yet.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM is trying to establish a session ... this can take some time.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>SAM session established! Now setting up a forward session ...
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Online, SAM is working as exptected
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+41"/>
-        <source>You key uses %1 for signing and %2 for crypto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+42"/>
-        <source>stop SAM tunnel first to generate a new key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to load a key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>stop SAM tunnel first to disable SAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-136"/>
+        <location line="+2"/>
         <source>client</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21828,7 +21298,71 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+118"/>
+        <location line="+11"/>
+        <location line="+62"/>
+        <location line="+4"/>
+        <source>BOB is processing a request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>connectivity check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>generating key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>shuting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is processing a request: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB is broken
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB encountered an error:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>BOB tunnel is running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is working fine: tunnel established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>BOB tunnel is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>BOB is inactive: tunnel closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+66"/>
         <source>request a new server key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21838,7 +21372,22 @@ When changing options use the buttons at the bottom to restart SAMv3.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+6"/>
+        <source>stop BOB tunnel first to generate a new key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to load a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>stop BOB tunnel first to disable BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>You are reachable through the hidden service.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21850,12 +21399,12 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+267"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+231"/>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+50"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This clears the list of known addresses. This action is useful if for some reason your address list contains an invalid/irrelevant/expired address that you want to avoid passing to your friends as a contact address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21865,7 +21414,7 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-625"/>
+        <location line="-372"/>
         <source>Download limit (KB/s) </source>
         <translation type="unfinished"></translation>
     </message>
@@ -21880,23 +21429,23 @@ Also check your ports!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+239"/>
+        <location line="+221"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+336"/>
+        <location line="+101"/>
         <source>WARNING:
 These values don&apos;t take into account the Relays.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+127"/>
+        <location line="+124"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Configure your Tor and I2P SOCKS proxy here. It will allow you to also connect &lt;/p&gt;&lt;p&gt;to hidden nodes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+130"/>
+        <location line="+136"/>
         <source>Tor Socks Proxy default: 127.0.0.1:9050.  Set in torrc config and update here.
 
 I2P Socks Proxy: see http://127.0.0.1:7657/i2ptunnelmgr for setting up a client tunnel:
@@ -21907,7 +21456,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+253"/>
+        <location line="+225"/>
+        <source>Automatic I2P/BOB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Enable I2P BOB - changing this requires a restart to fully take effect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
         <source>enableds advanced settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21917,7 +21476,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+9"/>
+        <source>I2P Basic Open Bridge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+14"/>
         <source>I2P Instance address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21927,7 +21491,17 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+7"/>
+        <source>I2P proxy port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+32"/>
+        <source>BOB accessible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21967,7 +21541,7 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+53"/>
+        <location line="+46"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21982,7 +21556,12 @@ You can connect to Hidden Nodes, even if you are running a standard Node, so why
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-633"/>
+        <location line="+17"/>
+        <source>BOB status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-647"/>
         <source>Incoming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22018,32 +21597,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
-        <source>Automatic I2P</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Enable I2P SAMv3 - changing this requires a restart to fully take effect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+32"/>
-        <source>I2P Simple Anonymous Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+62"/>
-        <source>SAM accessible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+350"/>
-        <source>SAM status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+301"/>
+        <location line="+782"/>
         <source>Relay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22098,7 +21652,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+270"/>
+        <location line="+53"/>
         <source>Warning: This bandwidth adds up to the max bandwidth.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22123,7 +21677,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+240"/>
+        <location line="+23"/>
         <source>&lt;p&gt;By activating relays, you allow your Retroshare node to act as a bridge between Retroshare  users who cannot connect directly, e.g. because they&apos;re firewalled.&lt;/p&gt;
 &lt;p&gt;You may choose to act as a relay by checking &lt;i&gt;enable relay connections&lt;/i&gt;, or simply  benefit from other peers acting as relay, by checking &lt;i&gt;use relay servers&lt;/i&gt;. For the former,  you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.&lt;/p&gt;
 &lt;p&gt;In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.&lt;/p&gt;</source>
@@ -22135,7 +21689,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="-1097"/>
+        <location filename="../gui/settings/ServerPage.ui" line="-663"/>
         <source>IP Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22158,7 +21712,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     <message>
         <location line="-109"/>
         <location line="+114"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1796"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1766"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22218,28 +21772,17 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1104"/>
+        <location line="-1107"/>
         <source>Hidden Service Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-43"/>
-        <source>Allow RetroShare to ask my ip to these DNS servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+16"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+815"/>
-        <source>List of OpenDns servers used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+58"/>
+        <location line="+31"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the port of the Tor Socks proxy. Your Retroshare node can use this port to connect to&lt;/p&gt;&lt;p&gt;Hidden nodes. The led at right turns green when this port is active on your computer. &lt;/p&gt;&lt;p&gt;This does not mean however that your Retroshare traffic transits though Tor. It does only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+35"/>
+        <location line="+41"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though Tor. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22255,18 +21798,18 @@ If you have issues connecting over Tor check the Tor logs too.</source>
     </message>
     <message>
         <location line="+25"/>
-        <location line="+356"/>
+        <location line="+360"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This led is green when the port listen on the left is active on your computer. It does not&lt;/p&gt;&lt;p&gt;mean that your Retroshare traffic transits though I2P. It will do so only if &lt;/p&gt;&lt;p&gt;you connect to Hidden nodes, or if you are running a Hidden node yourself.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-353"/>
+        <location line="-357"/>
         <source>I2P outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+105"/>
-        <location filename="../gui/settings/ServerPage.cpp" line="+305"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+1100"/>
         <source>Service Address</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22301,12 +21844,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="-1123"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="-1103"/>
         <source>IP Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+546"/>
+        <location line="+549"/>
         <source>Reported by DHT for IP masquerading</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22329,22 +21872,22 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.ui" line="+678"/>
+        <location filename="../gui/settings/ServerPage.ui" line="+675"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;White listed IPs are gathered from the following sources: IPs coming inside a manually exchanged certificate, IP ranges entered by you in this window, or in the security feed items.&lt;/p&gt;&lt;p&gt;The default behavior for Retroshare is to (1) always allow connection to peers with IP in the whitelist, even if that IP is also blacklisted; (2) optionally require IPs to be  in the whitelist. You can change this behavior for each peer in the &amp;quot;Details&amp;quot; window of each Retroshare node. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1560"/>
+        <location line="-1307"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The DHT allows you to answer connection requests from your friends using BitTorrent&apos;s DHT. It greatly improves the connectivity. No information is actually stored in the DHT. It is only used as a proxy system to get in touch with other Retroshare nodes.&lt;/p&gt;&lt;p&gt;The Discovery service sends node name and ids of your trusted contacts to connected peers, to help them choose new friends. The friendship is never automatic however, and both peers still need to trust each other to allow connection. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+51"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bullet turns green as soon as Retroshare manages to get your own IP from the websites listed below, if you enabled that action. Retroshare will also use other means to find out your own IP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1386"/>
+        <location line="+1142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22379,7 +21922,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-938"/>
+        <location line="-941"/>
         <source>Outgoing Manual Tor/I2P</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22389,12 +21932,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+28"/>
         <source>Tor outgoing Okay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/ServerPage.cpp" line="+572"/>
+        <location filename="../gui/settings/ServerPage.cpp" line="+548"/>
         <source>Tor proxy is not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22474,7 +22017,7 @@ If you have issues connecting over Tor check the Tor logs too.</source>
 <context>
     <name>ShareKey</name>
     <message>
-        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+77"/>
+        <location filename="../gui/gxs/GxsGroupShareKey.ui" line="+68"/>
         <source>check peers you would like to share private publish key with</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22484,12 +22027,12 @@ If you have issues connecting over Tor check the Tor logs too.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-72"/>
+        <location line="-63"/>
         <source>Share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+160"/>
+        <location line="+145"/>
         <source>You can let your friends know about your Channel by sharing it with them. 
 Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
@@ -22508,7 +22051,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+40"/>
         <source>Shared directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22528,17 +22071,17 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
+        <location line="+29"/>
         <source>Add new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+34"/>
+        <location line="+33"/>
         <source>Cancel</source>
         <translation type="unfinished">取消 </translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="-36"/>
         <source>Add a Share Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22548,7 +22091,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+30"/>
+        <location filename="../gui/ShareManager.ui" line="+29"/>
         <source>Apply and close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22639,7 +22182,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/ShareManager.ui" line="+119"/>
+        <location filename="../gui/ShareManager.ui" line="+87"/>
         <source>This is a list of shared folders. You can add and remove folders using the buttons at the bottom. When you add a new folder, intially all files in that folder are shared. You can separately setup share flags for each shared directory.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22647,7 +22190,7 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SharedFilesDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+73"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.ui" line="+66"/>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22698,16 +22241,11 @@ Select the Friends with which you want to Share your Channel.</source>
     </message>
     <message>
         <location line="+19"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forces the re-check of all shared directories. While automatic file checking only cares for new/removed files for efficiency reasons, this button will force the re-scan of all files, possibly re-hashing existing files that may have changed. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source>check files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+23"/>
+        <location line="+19"/>
         <source>Download selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22717,7 +22255,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation>下載</translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-333"/>
+        <location filename="../gui/FileTransfer/SharedFilesDialog.cpp" line="-330"/>
         <source>Copy retroshare Links to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22732,7 +22270,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+444"/>
+        <location line="+441"/>
         <source>Some files have been omitted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22748,7 +22286,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-631"/>
+        <location line="-628"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22773,7 +22311,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+432"/>
+        <location line="+429"/>
         <source>Some files have been omitted because they have not been indexed yet.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22916,12 +22454,12 @@ Select the Friends with which you want to Share your Channel.</source>
 <context>
     <name>SplashScreen</name>
     <message>
-        <location filename="../main.cpp" line="+313"/>
+        <location filename="../main.cpp" line="+310"/>
         <source>Load configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+42"/>
+        <location line="+43"/>
         <source>Create interface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22945,7 +22483,7 @@ Select the Friends with which you want to Share your Channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+15"/>
         <source>Log In</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23284,7 +22822,7 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+30"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23521,7 +23059,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TagsMenu</name>
     <message>
-        <location filename="../gui/msgs/TagsMenu.cpp" line="+135"/>
+        <location filename="../gui/msgs/TagsMenu.cpp" line="+107"/>
         <source>Remove All Tags</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23557,15 +23095,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+39"/>
-        <location line="+46"/>
+        <location line="+27"/>
         <source>Tor status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-36"/>
-        <location filename="../TorControl/TorControlWindow.cpp" line="+89"/>
-        <location line="+6"/>
+        <location line="+10"/>
         <source>Unknown</source>
         <translation type="unfinished">未知</translation>
     </message>
@@ -23575,13 +23110,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Hidden address:</source>
+        <location line="+7"/>
+        <source>Hidden service address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
-        <location line="+23"/>
+        <location line="+10"/>
+        <source>Tor bootstrap status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+17"/>
         <source>Not set</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23591,57 +23131,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../TorControl/TorControlWindow.cpp" line="-13"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Socket connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Authenticated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Hidden service ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+8"/>
-        <source>Tor offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Tor ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
+        <location filename="../TorControl/TorControlWindow.cpp" line="+86"/>
         <source>Check that Tor is accessible in your executable path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>[Waiting for Tor...]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23649,7 +23144,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TorStatus</name>
     <message>
-        <location filename="../gui/statusbar/torstatus.cpp" line="+46"/>
+        <location filename="../gui/statusbar/torstatus.cpp" line="+47"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23659,7 +23154,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+77"/>
         <source>Tor is currently offline</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23670,12 +23165,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location line="+6"/>
-        <location line="+55"/>
         <source>No tor configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-28"/>
+        <location line="+27"/>
         <source>Tor proxy is OK</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23703,7 +23197,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferPage</name>
     <message>
-        <location filename="../gui/settings/TransferPage.ui" line="+355"/>
+        <location filename="../gui/settings/TransferPage.ui" line="+318"/>
         <location line="+6"/>
         <source>Transfer options</source>
         <translation type="unfinished"></translation>
@@ -23714,7 +23208,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-344"/>
+        <location line="-307"/>
         <source>Shared Directories</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23724,27 +23218,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-10"/>
+        <source>Edit Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-12"/>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+12"/>
-        <source>Configure shared directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+28"/>
+        <location line="+40"/>
         <source>Auto-check shared directories every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will quickly scan shared directories for new/removed files. It will not detect changes in existing files for efficiency reasons. It is however possible to force a full re-scan of the entire hierarchy including possibly modified files using the &amp;quot;check files&amp;quot; button in shared files tab.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
         <source> minute(s)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23829,7 +23318,7 @@ p, li { white-space: pre-wrap; }
         <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;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&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-family:&apos;Sans&apos;; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt; is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&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-family:&apos;Sans&apos;; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory in the shared files dialog to be:&lt;/span&gt;&lt;/p&gt;
@@ -23838,12 +23327,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
-        <source>Minimum font size for Shared Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+52"/>
         <source>Maximum uploads per friend (0 = no limit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23868,12 +23352,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior (although not recommended on Windows systems). &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a good compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
+        <location line="+37"/>
         <source>Streaming</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23938,7 +23417,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+69"/>
+        <location line="+47"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Streaming &lt;/span&gt;causes the transfer to request 1MB file chunks in increasing order, facilitating preview while downloading. &lt;span style=&quot; font-weight:600;&quot;&gt;Random&lt;/span&gt; is purely random and favors swarming behavior. &lt;span style=&quot; font-weight:600;&quot;&gt;Progressive&lt;/span&gt; is a compromise, selecting the next chunk at random within less than 50MB after the end of the partial file. That allows  some randomness while preventing large empty file initialization times.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Retroshare will suspend all transfers and config file saving if the disk space goes below this limit. That prevents loss of information on some systems. A popup window will warn you when that happens.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23948,17 +23432,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/TransferPage.cpp" line="+220"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, randomly writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway (otherwise use &quot;progressive&quot;)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+34"/>
+        <location filename="../gui/settings/TransferPage.cpp" line="+228"/>
         <source>Set Incoming Directory</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23986,7 +23460,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransferUserNotify</name>
     <message>
-        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+34"/>
+        <location filename="../gui/FileTransfer/TransferUserNotify.cpp" line="+36"/>
         <source>Download completed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24014,19 +23488,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>TransfersDialog</name>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+145"/>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1405"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="+138"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1399"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+125"/>
+        <location line="+122"/>
         <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="+1"/>
         <source>Uploads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-922"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-916"/>
         <source>Name</source>
         <comment>i.e: file name</comment>
         <translation type="unfinished"></translation>
@@ -24233,12 +23707,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+88"/>
-        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;    File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct    transfers from your friends, and distant anonymous tunnelled    transfers. In addition, file transfer is multi-source and    allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the    &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt;   icon from the left side bar. These files will be listed in    the My Files tab. You can decide for each friend group whether   they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists,   and distant files that can be reached anonymously using the    multi-hop tunnelling system.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+174"/>
+        <location line="+253"/>
         <source>Move in Queue...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24263,7 +23732,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+301"/>
+        <location line="+304"/>
         <source>Anonymous end-to-end encrypted tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24284,7 +23753,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+293"/>
+        <location line="+304"/>
         <location line="+10"/>
         <location line="+7"/>
         <location line="+9"/>
@@ -24317,17 +23786,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+28"/>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>On Windows systems, writing in the middle of large empty files may hang the software for several seconds. Do you want to use this option anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+103"/>
+        <location line="+127"/>
         <source>Change file name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24342,7 +23801,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1344"/>
+        <location line="-1345"/>
         <location line="+4"/>
         <source>Expand all</source>
         <translation type="unfinished"></translation>
@@ -24469,18 +23928,23 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+16"/>
+        <source>&lt;h1&gt;&lt;img width=&quot;%1&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;File Transfer&lt;/h1&gt;&lt;p&gt;Retroshare brings two ways of transferring files: direct transfers from your friends, and distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming (you can be a source while downloading)&lt;/p&gt;&lt;p&gt;You can share files using the &lt;img src=&quot;:/images/directoryadd_24x24_shadow.png&quot; width=%2 /&gt; icon from the left side bar. These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files in their Friends Files tab&lt;/p&gt;&lt;p&gt;The search tab reports files from your friends&apos; file lists, and distant files that can be reached anonymously using the multi-hop tunnelling system.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+359"/>
         <location line="+57"/>
         <source>Columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-188"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.ui" line="-185"/>
         <source>File Transfers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-459"/>
+        <location filename="../gui/FileTransfer/TransfersDialog.cpp" line="-450"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24490,7 +23954,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1125"/>
+        <location line="+1130"/>
         <source>Could not delete preview file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24500,7 +23964,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-1170"/>
+        <location line="-1175"/>
         <source>Create Collection...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24515,7 +23979,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+267"/>
+        <location line="+258"/>
         <source>Collection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24525,7 +23989,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+249"/>
+        <location line="+252"/>
         <source>Anonymous tunnel 0x</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24939,17 +24403,12 @@ p, li { white-space: pre-wrap; }
         <translation>表單</translation>
     </message>
     <message>
-        <location line="+8"/>
+        <location line="+6"/>
         <source>Enable Retroshare WEB Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
-        <source>Status:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+22"/>
+        <location line="+10"/>
         <source>Web parameters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24989,27 +24448,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.cpp" line="+76"/>
+        <location filename="../gui/settings/WebuiPage.cpp" line="+62"/>
         <source>Please select the directory were to find retroshare webinterface files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+45"/>
-        <source>Missing passphrase</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>Please set a passphrase to proect the access to the WEB interface.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+43"/>
+        <location line="+69"/>
         <source>&lt;h1&gt;&lt;img width=&quot;24&quot; src=&quot;:/icons/help_64.png&quot;&gt;&amp;nbsp;&amp;nbsp;Webinterface&lt;/h1&gt;       &lt;p&gt;The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.&lt;/p&gt;     &lt;p&gt;Warning: don&apos;t expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+34"/>
         <source>Webinterface not enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25019,12 +24468,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+36"/>
         <source>failed to start Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/settings/WebuiPage.h" line="+50"/>
+        <location filename="../gui/settings/WebuiPage.h" line="+48"/>
         <source>Webinterface</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25161,7 +24610,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+94"/>
+        <location filename="../gui/WikiPoos/WikiDialog.ui" line="+80"/>
         <source>Page Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25176,7 +24625,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+55"/>
         <source>&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25264,7 +24713,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>WikiEditDialog</name>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+64"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+55"/>
         <source>Page Edit History</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25299,7 +24748,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+25"/>
+        <location line="+22"/>
         <source>\/</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25329,18 +24778,14 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+303"/>
+        <location line="+30"/>
+        <location filename="../gui/WikiPoos/WikiEditDialog.cpp" line="+302"/>
         <location line="+119"/>
         <source>Show Edit History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/WikiPoos/WikiEditDialog.ui" line="+23"/>
+        <location line="+23"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25361,7 +24806,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+20"/>
         <source>Submit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25444,7 +24889,16 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+33"/>
+        <source>...</source>
+        <translation type="obsolete">...</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+13"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25459,7 +24913,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
+        <location line="+15"/>
         <source>Who to Follow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25479,7 +24933,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
+        <location line="+27"/>
         <source>Most Recent</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25509,7 +24963,11 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-196"/>
+        <source>New</source>
+        <translation type="vanished">新建</translation>
+    </message>
+    <message>
+        <location line="-192"/>
         <source>Yourself</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25519,7 +24977,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireDialog.cpp" line="+204"/>
+        <location filename="../gui/TheWire/WireDialog.cpp" line="+152"/>
         <location line="+93"/>
         <source>RetroShare</source>
         <translation type="unfinished"></translation>
@@ -25582,42 +25040,35 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">表單</translation>
     </message>
     <message>
-        <location line="+86"/>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+76"/>
+        <location line="+6"/>
+        <source>Masthead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location line="+7"/>
         <source>MastHead background Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-32"/>
+        <location line="+7"/>
         <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-37"/>
+        <location line="+7"/>
         <source>Tagline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+10"/>
-        <source>Remove</source>
-        <translation type="unfinished">刪除</translation>
-    </message>
-    <message>
-        <location line="+7"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="-34"/>
+        <location filename="../gui/TheWire/WireGroupExtra.cpp" line="+43"/>
         <source>Load Masthead</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+24"/>
-        <source>Use the mouse to zoom and adjust the image for your background.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WireGroupItem</name>
@@ -25662,41 +25113,11 @@ p, li { white-space: pre-wrap; }
         <source>Edit Profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../gui/TheWire/WireGroupItem.cpp" line="+126"/>
-        <source>Own</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>N/A</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+6"/>
-        <source>Following</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Unfollow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Follow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>misc</name>
     <message>
-        <location filename="../util/misc.cpp" line="+44"/>
+        <location filename="../util/misc.cpp" line="+41"/>
         <source>Unknown</source>
         <comment>Unknown (size)</comment>
         <translation>未知</translation>
@@ -25774,7 +25195,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+36"/>
+        <location line="+38"/>
         <source>k</source>
         <comment>e.g: 3.1 k</comment>
         <translation type="unfinished"></translation>
@@ -25811,7 +25232,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>pgpid_item_model</name>
     <message>
-        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+48"/>
+        <location filename="../gui/NetworkDialog/pgpid_item_model.cpp" line="+45"/>
         <source> Do you accept connections signed by this profile?</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 228f24067..13710a28b 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -29,10 +29,6 @@ CrashStackTrace gCrashStackTrace;
 #include <QObject>
 #include <QMessageBox>
 #include <QSplashScreen>
-#include <QMessageBox>
-#include <QBuffer>
-#include <QSharedMemory>
-#include <QLocalSocket>
 
 #include <rshare.h>
 #include "gui/common/FilesDefs.h"
@@ -95,10 +91,10 @@ CrashStackTrace gCrashStackTrace;
 extern "C" {
 __declspec(dllexport) __cdecl BOOL _OPENSSL_isservice(void)
 {
-    DWORD sess;
-    if (ProcessIdToSessionId(GetCurrentProcessId(),&sess))
-        return sess==0;
-    return FALSE;
+	DWORD sess;
+	if (ProcessIdToSessionId(GetCurrentProcessId(),&sess))
+		return sess==0;
+	return FALSE;
 }
 }
 #endif
@@ -110,468 +106,286 @@ __declspec(dllexport) __cdecl BOOL _OPENSSL_isservice(void)
 #include "gui/notifyqt.h"
 #include <unistd.h>
 
-static void showHelp(const argstream& as)
-{
-        RsInfo() << "\n" <<
-            "+================================================================+\n"
-            "|     o---o                                             o        |\n"
-            "|      \\ /               - Retroshare GUI -            / \\       |\n"
-            "|       o                                             o---o      |\n"
-            "+================================================================+"
-                 << std::endl ;
-
-        std::cerr << as.usage(false) << std::endl;
-
-        char *argv[1];
-        int argc=0;
-        QApplication dummyApp (argc, argv); // needed for QMessageBox
-        QMessageBox box;
-        QString text = QString::fromUtf8(as.usage(false,false).c_str());
-        QFont font("Courier New",10,50,false);
-        font.setStyleHint(QFont::TypeWriter,QFont::PreferMatch);
-        font.setStyle(QFont::StyleNormal);
-        font.setBold(true);
-        box.setFont(font);
-        box.setInformativeText(text);
-        box.setWindowTitle(QObject::tr("Retroshare commandline arguments"));
-
-        // now compute the size of text and set the size of the box. For the record, this doesn't work...
-        box.setBaseSize( QSize(QFontMetricsF(font).width(text),QFontMetricsF(font).height()*text.count('\n')) );
-        box.exec();
-}
-
-static bool notifyRunningInstance()
-{
-    // Connect to the Local Server of the main process to notify it
-    // that a new process had been started
-
-    RsInfo() << "Trying to contact running instance through socket \"" << TARGET << "\"";
-    QLocalSocket localSocket;
-    localSocket.connectToServer(QString(TARGET));
-#ifdef DEBUG
-    std::cerr << "RsApplication::RsApplication waitForConnected to other instance." << std::endl;
-#endif
-    if( localSocket.waitForConnected(100) )
-    {
-#ifdef DEBUG
-        std::cerr << "RsApplication::RsApplication Connection etablished. Waiting for disconnection." << std::endl;
-#endif
-        localSocket.waitForDisconnected(1000);
-        return true;
-    }
-    else
-    {
-#ifdef DEBUG
-        std::cerr << "RsApplication::RsApplication failed to connect to other instance." << std::endl;
-#endif
-        return false;
-    }
-}
-
-static void sendArgsToRunningInstance(const QStringList& args)
-{
-    QString serverName = QString(TARGET);
-
-    // load into shared memory
-    QBuffer buffer;
-    buffer.open(QBuffer::ReadWrite);
-    QDataStream out(&buffer);
-    out << args;
-    int size = buffer.size();
-
-    QSharedMemory newArgs;
-    newArgs.setKey(serverName + "_newArgs");
-    if (newArgs.isAttached()) newArgs.detach();
-
-    if (!newArgs.create(size)) {
-        std::cerr << "(EE) RsApplication::RsApplication Unable to create shared memory segment of size:"
-              << size << " error:" << newArgs.errorString().toStdString() << "." << std::endl;
-#ifdef Q_OS_UNIX
-        std::cerr << "Look with `ipcs -m` for nattch==0 segment. And remove it with `ipcrm -m 'shmid'`." << std::endl;
-        //No need for windows, as it removes shared segment directly even when crash.
-#endif
-        newArgs.detach();
-        ::exit(EXIT_FAILURE);
-    }
-    newArgs.lock();
-    char *to = (char*)newArgs.data();
-    const char *from = buffer.data().data();
-    memcpy(to, from, qMin(newArgs.size(), size));
-    newArgs.unlock();
-
-    std::cerr << "RsApplication::RsApplication waitForConnected to other instance." << std::endl;
-    if(notifyRunningInstance())
-    {
-        newArgs.detach();
-        std::cerr << "RsApplication::RsApplication Arguments was sended." << std::endl
-              << " To disable it, in Options - General - Misc," << std::endl
-              << " uncheck \"Use Local Server to get new Arguments\"." << std::endl;
-        ::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function
-    }
-    else
-        std::cerr << "RsApplication::RsApplication failed to connect to other instance." << std::endl;
-    newArgs.detach();
-}
-
-static bool setLanguage(const std::string& language)
-{
-    if(!language.empty())
-    {
-        if(!LanguageSupport::translate(QString::fromStdString(language)))
-        {
-            RsErr() << "Language \"" << language << "\" is not supported." ;
-
-            QString s;
-            for(QString ss:LanguageSupport::languageCodes())
-                s += ss + ", " ;
-
-            RsErr() << "Possible choices are: " << s.toStdString();
-            return false;
-        }
-        return true;
-    }
-    else
-    {
-        LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
-        return true;
-    }
-}
-
-
 static void displayWarningAboutDSAKeys()
 {
-    std::map<std::string,std::vector<std::string> > unsupported_keys;
-    RsAccounts::GetUnsupportedKeys(unsupported_keys);
+	std::map<std::string,std::vector<std::string> > unsupported_keys;
+	RsAccounts::GetUnsupportedKeys(unsupported_keys);
+	
+	if(unsupported_keys.empty())
+		return ;
 
-    if(unsupported_keys.empty())
-        return ;
+	QMessageBox msgBox;
 
-    QMessageBox msgBox;
+	QString txt = QObject::tr("You appear to have nodes associated to DSA keys:");
+	txt += "<UL>" ;
+	for(std::map<std::string,std::vector<std::string> >::const_iterator it(unsupported_keys.begin());it!=unsupported_keys.end();++it)
+	{
+		txt += "<LI>" + QString::fromStdString(it->first) ;
+		txt += "<UL>" ;
 
-    QString txt = QObject::tr("You appear to have nodes associated to DSA keys:");
-    txt += "<UL>" ;
-    for(std::map<std::string,std::vector<std::string> >::const_iterator it(unsupported_keys.begin());it!=unsupported_keys.end();++it)
-    {
-        txt += "<LI>" + QString::fromStdString(it->first) ;
-        txt += "<UL>" ;
+		for(uint32_t i=0;i<it->second.size();++i)
+			txt += "<li>" + QString::fromStdString(it->second[i]) + "</li>" ;
 
-        for(uint32_t i=0;i<it->second.size();++i)
-            txt += "<li>" + QString::fromStdString(it->second[i]) + "</li>" ;
+		txt += "</UL>" ;
+		txt += "</li>" ;
+	}
+	txt += "</UL>" ;
 
-        txt += "</UL>" ;
-        txt += "</li>" ;
-    }
-    txt += "</UL>" ;
-
-    msgBox.setText(txt) ;
-    msgBox.setInformativeText(QObject::tr("DSA keys are not yet supported by this version of RetroShare. All these nodes will be unusable. We're very sorry for that."));
-    msgBox.setStandardButtons(QMessageBox::Ok);
-    msgBox.setDefaultButton(QMessageBox::Ok);
+	msgBox.setText(txt) ;
+	msgBox.setInformativeText(QObject::tr("DSA keys are not yet supported by this version of RetroShare. All these nodes will be unusable. We're very sorry for that."));
+	msgBox.setStandardButtons(QMessageBox::Ok);
+	msgBox.setDefaultButton(QMessageBox::Ok);
     msgBox.setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
 
-    msgBox.exec();
+	msgBox.exec();
 }
 
 #ifdef WINDOWS_SYS
 #if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0) && QT_VERSION < QT_VERSION_CHECK (5, 3, 0)
 QStringList filedialog_open_filenames_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
 {
-    return QFileDialog::getOpenFileNames(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
+	return QFileDialog::getOpenFileNames(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
 }
 
 QString filedialog_open_filename_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
 {
-    return QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
+	return QFileDialog::getOpenFileName(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
 }
 
 QString filedialog_save_filename_hook(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options)
 {
-    return QFileDialog::getSaveFileName(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
+	return QFileDialog::getSaveFileName(parent, caption, dir, filter, selectedFilter, options | QFileDialog::DontUseNativeDialog);
 }
 
 QString filedialog_existing_directory_hook(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options)
 {
-    return QFileDialog::getExistingDirectory(parent, caption, dir, options | QFileDialog::DontUseNativeDialog);
+	return QFileDialog::getExistingDirectory(parent, caption, dir, options | QFileDialog::DontUseNativeDialog);
 }
 #endif
 #endif
 
 int main(int argc, char *argv[])
-{
+{ 
 #ifdef WINDOWS_SYS
-    // The current directory of the application is changed when using the native dialog on Windows
-    // This is a quick fix until libretroshare is using a absolute path in the portable Version
+	// The current directory of the application is changed when using the native dialog on Windows
+	// This is a quick fix until libretroshare is using a absolute path in the portable Version
 #if QT_VERSION >= QT_VERSION_CHECK (5, 3, 0)
-    // Do we need a solution in v0.6?
+	// Do we need a solution in v0.6?
 #endif
 #if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0) && QT_VERSION < QT_VERSION_CHECK (5, 3, 0)
-    typedef QStringList (*_qt_filedialog_open_filenames_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-    typedef QString (*_qt_filedialog_open_filename_hook)     (QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-    typedef QString (*_qt_filedialog_save_filename_hook)     (QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
-    typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options);
+	typedef QStringList (*_qt_filedialog_open_filenames_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
+	typedef QString (*_qt_filedialog_open_filename_hook)     (QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
+	typedef QString (*_qt_filedialog_save_filename_hook)     (QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options);
+	typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options);
 
-    extern Q_GUI_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook;
-    extern Q_GUI_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook;
-    extern Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook;
-    extern Q_GUI_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook;
+	extern Q_GUI_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook;
+	extern Q_GUI_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook;
+	extern Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook;
+	extern Q_GUI_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook;
 
-    qt_filedialog_open_filename_hook = filedialog_open_filename_hook;
-    qt_filedialog_open_filenames_hook = filedialog_open_filenames_hook;
-    qt_filedialog_save_filename_hook = filedialog_save_filename_hook;
-    qt_filedialog_existing_directory_hook = filedialog_existing_directory_hook;
+	qt_filedialog_open_filename_hook = filedialog_open_filename_hook;
+	qt_filedialog_open_filenames_hook = filedialog_open_filenames_hook;
+	qt_filedialog_save_filename_hook = filedialog_save_filename_hook;
+	qt_filedialog_existing_directory_hook = filedialog_existing_directory_hook;
 #endif
 #if QT_VERSION < QT_VERSION_CHECK (5, 0, 0)
-    extern bool Q_GUI_EXPORT qt_use_native_dialogs;
-    qt_use_native_dialogs = false;
+	extern bool Q_GUI_EXPORT qt_use_native_dialogs;
+	qt_use_native_dialogs = false;
 #endif
 
-    {
-        /* Set the current directory to the application dir,
-           because the start dir with autostart from the registry run key is not the exe dir */
-        QApplication app(argc, argv);
-        QDir::setCurrent(QCoreApplication::applicationDirPath());
-    }
+	{
+		/* Set the current directory to the application dir,
+		   because the start dir with autostart from the registry run key is not the exe dir */
+		QApplication app(argc, argv);
+		QDir::setCurrent(QCoreApplication::applicationDirPath());
+	}
 #endif
 #ifdef SIGFPE_DEBUG
 feenableexcept(FE_INVALID | FE_DIVBYZERO);
 #endif
 
-    QStringList args = char_array_to_stringlist(argv+1, argc-1);
+	QStringList args = char_array_to_stringlist(argv+1, argc-1);
 
     Q_INIT_RESOURCE(images);
     Q_INIT_RESOURCE(icons);
 
-    // This is needed to allocate rsNotify, so that it can be used to ask for PGP passphrase
-    //
-    RsControl::earlyInitNotificationSystem() ;
+	// Loop through all command-line args/values to get help wanted before RsInit exit.
+	for (int i = 0; i < args.size(); ++i) {
+		QString arg;
+		/* Get the argument name and set a blank value */
+		arg = args.at(i);
+		if ((arg.toLower() == "-h") || (arg.toLower() == "--help")) {
+			QApplication dummyApp (argc, argv); // needed for QMessageBox
+			Rshare::showUsageMessageBox();
+		}
+	}
 
-    NotifyQt *notify = NotifyQt::Create();
-    rsNotify->registerNotifyClient(notify);
+	// This is needed to allocate rsNotify, so that it can be used to ask for PGP passphrase
+	//
+	RsControl::earlyInitNotificationSystem() ;
 
-    /* RetroShare Core Objects */
-    RsInit::InitRsConfig();
+	NotifyQt *notify = NotifyQt::Create();
+	rsNotify->registerNotifyClient(notify);
 
-    RsGUIConfigOptions conf;
+	/* RetroShare Core Objects */
+	RsInit::InitRsConfig();
 
-    std::string rslink,rsfile;
-    std::list<std::string> links_and_files;
-    std::string loglevel="off";
-    std::string logfilename,language,guistyle,guistylesheetfile;
+    RsConfigOptions conf;
 
-    argstream as(argc,argv);
-    as      >> option(   's',"stderr"             ,conf.outStderr                ,"output to stderr instead of log file "                                                      )
-            >> option(   'u',"udp"                ,conf.udpListenerOnly          ,"Only listen to UDP "                                                                        )
-            >> option(   'R',"reset"              ,conf.optResetParams           ,"reset retroshare parameters "                                                               )
-            >> parameter('c',"base-dir"           ,conf.optBaseDir               ,"directory"                             ,"Set base directory "                                  ,false)
-            >> parameter('l',"log-file"           ,logfilename                   ,"logfile"                               ,"Set Log filename "                                    ,false)
-            >> parameter('d',"debug-level"        ,loglevel                      ,"level (debug,info,notice,warn,error,off)","Set debug level "                                   ,false)
-            >> parameter('i',"ip-address"         ,conf.forcedInetAddress        ,"nnn.nnn.nnn.nnn"                       ,"Force IP address "                                    ,false)
-            >> parameter('p',"port"               ,conf.forcedPort               ,"port"                                  ,"Set listenning port "                                 ,false)
-            >> parameter('o',"opmode"             ,conf.opModeStr                ,"opmode (Full, NoTurtle, Gaming, Minimal)","Set mode" ,false)
-            >> parameter('t',"tor"                ,conf.userSuppliedTorExecutable,"path"                                  ,"supply full tor executable path "                     ,false)
-            >> parameter('g',"style"              ,guistyle                      ,"style (fusion,windows,gtk2,breeze)"    ,"set GUI style"                                        ,false)
-            >> parameter('k',"style"              ,guistylesheetfile             ,"file"                                  ,"gui stylesheet file"                                  ,false)
-            >> parameter('L',"lang"               ,language                      ,"langage (fr,cn,...)"                   ,"set language"                                         ,false)
-            >> parameter('r',"link"               ,rslink                        ,"retroshare link"                       ,"retroshare link to open (passed to running server)"   ,false)
-            >> parameter('f',"rsfile"             ,rsfile                        ,"rsfile"                                ,"rscollection file to open (passed to running server)" ,false);
+	argstream as(argc,argv);
+	as      >> option('s',"stderr"           ,conf.outStderr      ,"output to stderr instead of log file."    )
+	        >> option('u',"udp"              ,conf.udpListenerOnly,"Only listen to UDP."                      )
+	        >> parameter('c',"base-dir"      ,conf.optBaseDir     ,"directory", "Set base directory."                                         ,false)
+	        >> parameter('l',"log-file"      ,conf.logfname       ,"logfile"   ,"Set Log filename."                                           ,false)
+	        >> parameter('d',"debug-level"   ,conf.debugLevel     ,"level"     ,"Set debug level."                                            ,false)
+	        >> parameter('i',"ip-address"    ,conf.forcedInetAddress,"nnn.nnn.nnn.nnn", "Force IP address to use (if cannot be detected)."    ,false)
+	        >> parameter('p',"port"          ,conf.forcedPort     ,"port"      ,"Set listenning port to use."                                 ,false)
+            >> parameter('o',"opmode"        ,conf.opModeStr      ,"opmode"    ,"Set Operating mode (Full, NoTurtle, Gaming, Minimal)."       ,false)
+            >> parameter('t',"opmode"        ,conf.userSuppliedTorExecutable,"tor"    ,"supply full tor eecutable path."       ,false);
 #ifdef RS_JSONAPI
-    as      >> parameter('J', "jsonApiPort"       ,conf.jsonApiPort              ,"jsonApiPort"                           ,"Enable JSON API on the specified port"                ,false)
-            >> parameter('P', "jsonApiBindAddress",conf.jsonApiBindAddress       ,"jsonApiBindAddress"                    ,"JSON API Bind Address "                               ,false);
+	as      >> parameter('J', "jsonApiPort", conf.jsonApiPort, "jsonApiPort", "Enable JSON API on the specified port", false )
+	        >> parameter('P', "jsonApiBindAddress", conf.jsonApiBindAddress, "jsonApiBindAddress", "JSON API Bind Address.", false);
 #endif // ifdef RS_JSONAPI
 
 #ifdef LOCALNET_TESTING
-    as      >> parameter('R',"restrict-port" ,portRestrictions             ,"port1-port2","Apply port restriction "                   ,false);
+	as      >> parameter('R',"restrict-port" ,portRestrictions             ,"port1-port2","Apply port restriction"                   ,false);
 #endif // ifdef LOCALNET_TESTING
 
 #ifdef RS_AUTOLOGIN
-    as      >> option('a',"auto-login"       ,conf.autoLogin      ,"AutoLogin (Windows Only) + StartMinimised");
+	as      >> option('a',"auto-login"       ,conf.autoLogin      ,"AutoLogin (Windows Only) + StartMinimised");
 #endif // ifdef RS_AUTOLOGIN
-    as      >> values<std::string>(std::back_inserter(links_and_files),"links and rscollection files")
-            >> help('h',"help",QObject::tr("Display this help").toStdString().c_str());
-
-    if(!as.isOk())
-    {
-        std::cerr << "Incorrect arguments." << std::endl;
-        std::cerr << as.usage() << std::endl;
-        return 0;
-    }
-    conf.logFileName       = QString::fromStdString(logfilename);
-    conf.logLevel          = QString::fromStdString(loglevel);		      // these will be checked when used in RsApplication
-    conf.guiStyle          = QString::fromStdString(guistyle);	      	  // these will be checked when used in RsApplication
-    conf.guiStyleSheetFile = QString::fromUtf8(guistylesheetfile.c_str());// these will be checked when used in RsApplication
-
-    if(as.helpRequested())
-    {
-        showHelp(as);
-        return 0;
-    }
-    // Look for parameters to be transmitted to running server
-
-    if((!rslink.empty() || !rsfile.empty() || !links_and_files.empty() || !conf.opModeStr.empty()) && notifyRunningInstance())
-    {
-        QStringList args;
-        RsErr() << "Sending rscollection files, retroshare links and opmode parameters to the runnning retroshare server." ;
-
-        if(!rslink.empty()) { args.push_back("-l"); args.push_back(QString::fromUtf8(rslink.c_str())); }
-        if(!rsfile.empty()) { args.push_back("-f"); args.push_back(QString::fromUtf8(rsfile.c_str())); }
-
-        for(auto s:links_and_files)
-            args.push_back(QString::fromUtf8(s.c_str()));
-
-        if(!conf.opModeStr.empty()) { args.push_back("-o"); args.push_back(QString::fromStdString(conf.opModeStr)); }
-
-        sendArgsToRunningInstance(args);
-        return 0;
-    }
-
-    // Now start RS login system
 
     conf.main_executable_path = argv[0];
 
-    int initResult = RsInit::InitRetroShare(conf);
+	int initResult = RsInit::InitRetroShare(conf);
 
-    if(initResult == RS_INIT_NO_KEYRING)	// happens when we already have accounts, but no pgp key. This is when switching to the openpgp-sdk version.
-    {
-        QApplication dummyApp (argc, argv); // needed for QMessageBox
-        /* Translate into the desired language */
+	if(initResult == RS_INIT_NO_KEYRING)	// happens when we already have accounts, but no pgp key. This is when switching to the openpgp-sdk version.
+	{
+		QApplication dummyApp (argc, argv); // needed for QMessageBox
+		/* Translate into the desired language */
+		LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
 
-        if(!setLanguage(language))
-            return 1;
-
-        QMessageBox msgBox;
-        msgBox.setText(QObject::tr("This version of RetroShare is using OpenPGP-SDK. As a side effect, it's not using the system shared PGP keyring, but has it's own keyring shared by all RetroShare instances. <br><br>You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software."));
-        msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
-        msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
-        msgBox.setDefaultButton(QMessageBox::Ok);
+		QMessageBox msgBox;
+		msgBox.setText(QObject::tr("This version of RetroShare is using OpenPGP-SDK. As a side effect, it's not using the system shared PGP keyring, but has it's own keyring shared by all RetroShare instances. <br><br>You do not appear to have such a keyring, although PGP keys are mentioned by existing RetroShare accounts, probably because you just changed to this new version of the software."));
+		msgBox.setInformativeText(QObject::tr("Choose between:<br><ul><li><b>Ok</b> to copy the existing keyring from gnupg (safest bet), or </li><li><b>Close without saving</b> to start fresh with an empty keyring (you will be asked to create a new PGP key to work with RetroShare, or import a previously saved pgp keypair). </li><li><b>Cancel</b> to quit and forge a keyring by yourself (needs some PGP skills)</li></ul>"));
+		msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Discard | QMessageBox::Cancel);
+		msgBox.setDefaultButton(QMessageBox::Ok);
         msgBox.setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
 
-        int ret = msgBox.exec();
+		int ret = msgBox.exec();
 
-        if(ret == QMessageBox::Cancel)
-            return 0 ;
-        if(ret == QMessageBox::Ok)
-        {
-            if(!RsAccounts::CopyGnuPGKeyrings())
-                return 0 ;
+		if(ret == QMessageBox::Cancel)
+			return 0 ;
+		if(ret == QMessageBox::Ok)
+		{
+			if(!RsAccounts::CopyGnuPGKeyrings())
+				return 0 ; 
 
-            initResult = RsInit::InitRetroShare(conf);
+			initResult = RsInit::InitRetroShare(conf);
 
-            displayWarningAboutDSAKeys() ;
+			displayWarningAboutDSAKeys() ;
 
-        }
-        else
-            initResult = RS_INIT_OK ;
-    }
+		}
+		else
+			initResult = RS_INIT_OK ;
+	}
 
-    if (initResult < 0) {
-        /* Error occured */
-        QApplication dummyApp (argc, argv); // needed for QMessageBox
-        /* Translate into the desired language */
+	if (initResult < 0) {
+		/* Error occured */
+		QApplication dummyApp (argc, argv); // needed for QMessageBox
+		/* Translate into the desired language */
+		LanguageSupport::translate(LanguageSupport::defaultLanguageCode());
 
-        if(!setLanguage(language))
-            return 1;
+		displayWarningAboutDSAKeys();
 
-        displayWarningAboutDSAKeys();
-
-        QMessageBox mb(QMessageBox::Critical, QObject::tr("RetroShare"), "", QMessageBox::Ok);
+		QMessageBox mb(QMessageBox::Critical, QObject::tr("RetroShare"), "", QMessageBox::Ok);
         mb.setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
 
-        switch (initResult)
-        {
-            case RS_INIT_AUTH_FAILED:
-                std::cerr << "RsInit::InitRetroShare AuthGPG::InitAuth failed" << std::endl;
-                mb.setText(QObject::tr("Initialization failed. Wrong or missing installation of PGP."));
-                break;
-            default:
-                /* Unexpected return code */
-                std::cerr << "RsInit::InitRetroShare unexpected return code " << initResult << std::endl;
-                mb.setText(QObject::tr("An unexpected error occurred. Please report 'RsInit::InitRetroShare unexpected return code %1'.").arg(initResult));
-                break;
-        }
-        mb.exec();
-        return 1;
-    }
+		switch (initResult) 
+		{
+			case RS_INIT_AUTH_FAILED:
+				std::cerr << "RsInit::InitRetroShare AuthGPG::InitAuth failed" << std::endl;
+				mb.setText(QObject::tr("Initialization failed. Wrong or missing installation of PGP."));
+				break;
+			default:
+				/* Unexpected return code */
+				std::cerr << "RsInit::InitRetroShare unexpected return code " << initResult << std::endl;
+				mb.setText(QObject::tr("An unexpected error occurred. Please report 'RsInit::InitRetroShare unexpected return code %1'.").arg(initResult));
+				break;
+		}
+		mb.exec();
+		return 1;
+	}
 
-    /* create global settings object
-       path maybe wrong, when no profile exist
-       in this case it can be use only for default values */
-    RshareSettings::Create ();
+	/* create global settings object
+	   path maybe wrong, when no profile exist
+	   in this case it can be use only for default values */
+	RshareSettings::Create ();
 
-    if(LanguageSupport::isValidLanguageCode(QString::fromStdString(language)))
-        conf.language = QString::fromStdString(language);
+	/* Setup The GUI Stuff */
+	Rshare rshare(args, argc, argv,  QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
 
-    /* Setup The GUI Stuff */
-    //Rshare rshare(args, argc, argv,  QString::fromUtf8(RsAccounts::ConfigDirectory().c_str()));
-    RsApplication rshare(conf);
+	/* Start RetroShare */
+	QString sDefaultGXSIdToCreate = "";
+	switch (initResult) {
+	case RS_INIT_OK:
+		{
+			/* Login Dialog */
+			/* check for existing Certificate */
+			bool genCert = false;
+			std::list<RsPeerId> accountIds;
+			if (RsAccounts::GetAccountIds(accountIds) && (accountIds.size() > 0))
+			{
+				StartDialog sd;
+				if (sd.exec() == QDialog::Rejected) {
+					return 1;
+				}
 
-    if(!setLanguage(language))
-        return 1;
+				/* if we're logged in */
+				genCert = sd.requestedNewCert();
+			}
+			else
+			{
+				genCert = true;
+			}
 
-    /* Start RetroShare */
-    QString sDefaultGXSIdToCreate = "";
-    switch (initResult) {
-    case RS_INIT_OK:
-        {
-            /* Login Dialog */
-            /* check for existing Certificate */
-            bool genCert = false;
-            std::list<RsPeerId> accountIds;
-            if (RsAccounts::GetAccountIds(accountIds) && (accountIds.size() > 0))
-            {
-                StartDialog sd;
-                if (sd.exec() == QDialog::Rejected) {
-                    return 1;
-                }
+			if (genCert)
+			{
+				GenCertDialog gd(false);
 
-                /* if we're logged in */
-                genCert = sd.requestedNewCert();
-            }
-            else
-            {
-                genCert = true;
-            }
+				if (gd.exec () == QDialog::Rejected)
+					return 1;
 
-            if (genCert)
-            {
-                GenCertDialog gd(false);
+				sDefaultGXSIdToCreate = gd.getGXSNickname();
+			}
 
-                if (gd.exec () == QDialog::Rejected)
-                    return 1;
+			//splashScreen.show();
+		}
+		break;
+	case RS_INIT_HAVE_ACCOUNT:
+		{
+			//splashScreen.show();
+			//splashScreen.showMessage(rshare.translate("SplashScreen", "Load profile"), Qt::AlignHCenter | Qt::AlignBottom);
 
-                sDefaultGXSIdToCreate = gd.getGXSNickname();
-            }
+			RsPeerId preferredId;
+			RsAccounts::GetPreferredAccountId(preferredId);
 
-            //splashScreen.show();
-        }
-        break;
-    case RS_INIT_HAVE_ACCOUNT:
-        {
-            //splashScreen.show();
-            //splashScreen.showMessage(rshare.translate("SplashScreen", "Load profile"), Qt::AlignHCenter | Qt::AlignBottom);
-
-            RsPeerId preferredId;
-            RsAccounts::GetPreferredAccountId(preferredId);
-
-            // true: note auto-login is active
-            if(!RsApplication::loadCertificate(preferredId, true))
-            {
-                RsErr() << "Retroshare auto-login startup failed." ;
-                return 1;
-            }
-        }
-        break;
-    default:
-        /* Unexpected return code */
-        std::cerr << "RsInit::InitRetroShare unexpected return code " << initResult << std::endl;
-        QMessageBox::warning(0, QObject::tr("RetroShare"), QObject::tr("An unexpected error occured. Please report 'RsInit::InitRetroShare unexpected return code %1'.").arg(initResult));
-        return 1;
-    }
+			// true: note auto-login is active
+			Rshare::loadCertificate(preferredId, true);
+		}
+		break;
+	default:
+		/* Unexpected return code */
+		std::cerr << "RsInit::InitRetroShare unexpected return code " << initResult << std::endl;
+		QMessageBox::warning(0, QObject::tr("RetroShare"), QObject::tr("An unexpected error occured. Please report 'RsInit::InitRetroShare unexpected return code %1'.").arg(initResult));
+		return 1;
+	}
 
     /* recreate global settings object, now with correct path, specific to the selected node */
-    RshareSettings::Create(true);
-    RsApplication::resetLanguageAndStyle();
+	RshareSettings::Create(true);
+	Rshare::resetLanguageAndStyle();
 
-    SoundManager::create();
+	SoundManager::create();
 
     bool is_hidden_node = false;
     bool is_auto_tor = false ;
@@ -580,15 +394,15 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     RsAccounts::getCurrentAccountOptions(is_hidden_node,is_auto_tor,is_first_time);
 
     if(is_auto_tor)
-    {
+	{
         if(!conf.userSuppliedTorExecutable.empty())
             RsTor::setTorExecutablePath(conf.userSuppliedTorExecutable);
 
-        // Now that we know the Tor service running, and we know the SSL id, we can make sure it provides a viable hidden service
+		// Now that we know the Tor service running, and we know the SSL id, we can make sure it provides a viable hidden service
 
         std::string tor_hidden_service_dir = RsAccounts::AccountDirectory() + "/hidden_service/" ;
 
-        RsTor::setTorDataDirectory(RsApplication::dataDirectory().toStdString() + "/tor/");
+        RsTor::setTorDataDirectory(Rshare::dataDirectory().toStdString() + "/tor/");
         RsTor::setHiddenServiceDirectory(tor_hidden_service_dir);	// re-set it, because now it's changed to the specific location that is run
 
         RsDirUtil::checkCreateDirectory(std::string(tor_hidden_service_dir)) ;
@@ -596,72 +410,72 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
         //RsTor::setupHiddenService();
 
         if(! RsTor::start() || RsTor::hasError())
-        {
+		{
             QMessageBox::critical(NULL,QObject::tr("Cannot start Tor Manager!"),QObject::tr("Tor cannot be started on your system: \n\n")+QString::fromStdString(RsTor::errorMessage())) ;
-            return 1 ;
-        }
+			return 1 ;
+		}
 
-        {
+		{
             TorControlDialog tcd;
-            QString error_msg ;
-            tcd.show();
+			QString error_msg ;
+			tcd.show();
 
-            while(tcd.checkForTor(error_msg) != TorControlDialog::TOR_STATUS_OK || tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)	// runs until some status is reached: either tor works, or it fails.
-            {
-                QCoreApplication::processEvents();
-                rstime::rs_usleep(0.2*1000*1000) ;
+			while(tcd.checkForTor(error_msg) != TorControlDialog::TOR_STATUS_OK || tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)	// runs until some status is reached: either tor works, or it fails.
+			{
+				QCoreApplication::processEvents();
+				rstime::rs_usleep(0.2*1000*1000) ;
 
-                if(!error_msg.isNull())
-                {
-                    QMessageBox::critical(NULL,QObject::tr("Cannot start Tor"),QObject::tr("Sorry but Tor cannot be started on your system!\n\nThe error reported is:\"")+error_msg+"\"") ;
-                    return 1;
-                }
-            }
+				if(!error_msg.isNull())
+				{
+					QMessageBox::critical(NULL,QObject::tr("Cannot start Tor"),QObject::tr("Sorry but Tor cannot be started on your system!\n\nThe error reported is:\"")+error_msg+"\"") ;
+					return 1;
+				}
+			}
 
-            tcd.hide();
+			tcd.hide();
 
-            if(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)
-            {
-                QMessageBox::critical(NULL,QObject::tr("Cannot start a hidden tor service!"),QObject::tr("It was not possible to start a hidden service.")) ;
-                return 1 ;
-            }
-        }
-    }
+			if(tcd.checkForHiddenService() != TorControlDialog::HIDDEN_SERVICE_STATUS_OK)
+			{
+				QMessageBox::critical(NULL,QObject::tr("Cannot start a hidden tor service!"),QObject::tr("It was not possible to start a hidden service.")) ;
+				return 1 ;
+			}
+		}
+	}
 
     QSplashScreen splashScreen(FilesDefs::getPixmapFromQtResourcePath(":/images/logo/logo_splash.png")/* , Qt::WindowStaysOnTopHint*/);
 
-    splashScreen.show();
-    splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom);
+	splashScreen.show();
+	splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom);
 
-    QCoreApplication::processEvents();
+	QCoreApplication::processEvents();
 
-    /* stop Retroshare if startup fails */
-    if (!RsControl::instance()->StartupRetroShare())
-    {
-        std::cerr << "libretroshare failed to startup!" << std::endl;
-        return 1;
-    }
+	/* stop Retroshare if startup fails */
+	if (!RsControl::instance()->StartupRetroShare())
+	{
+		std::cerr << "libretroshare failed to startup!" << std::endl;
+		return 1;
+	}
 
     if(is_auto_tor)
-    {
-        // Tor works with viable hidden service. Let's use it!
+	{
+		// Tor works with viable hidden service. Let's use it!
 
         std::string service_id ;
         std::string onion_address ;
-        uint16_t service_port ;
-        uint16_t service_target_port ;
-        uint16_t proxy_server_port ;
+		uint16_t service_port ;
+		uint16_t service_target_port ;
+		uint16_t proxy_server_port ;
         std::string service_target_address ;
         std::string proxy_server_address ;
 
         RsTor::getHiddenServiceInfo(service_id,onion_address,service_port,service_target_address,service_target_port);
         RsTor::getProxyServerInfo(proxy_server_address,proxy_server_port) ;
 
-        std::cerr << "Got hidden service info: " << std::endl;
+		std::cerr << "Got hidden service info: " << std::endl;
         std::cerr << "  onion address  : " << onion_address << std::endl;
         std::cerr << "  service_id     : " << service_id << std::endl;
-        std::cerr << "  service port   : " << service_port << std::endl;
-        std::cerr << "  target port    : " << service_target_port << std::endl;
+		std::cerr << "  service port   : " << service_port << std::endl;
+		std::cerr << "  target port    : " << service_target_port << std::endl;
         std::cerr << "  target address : " << service_target_address << std::endl;
 
         std::cerr << "Setting proxy server to " << service_target_address << ":" << service_target_port << std::endl;
@@ -669,93 +483,95 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
         rsPeers->setLocalAddress(rsPeers->getOwnId(), service_target_address, service_target_port);
         rsPeers->setHiddenNode(rsPeers->getOwnId(), onion_address, service_port);
         rsPeers->setProxyServer(RS_HIDDEN_TYPE_TOR, proxy_server_address,proxy_server_port) ;
-    }
+	}
 
-    RsApplication::initPlugins();
+	Rshare::initPlugins();
 
-    splashScreen.showMessage(rshare.translate("SplashScreen", "Create interface"), Qt::AlignHCenter | Qt::AlignBottom);
-    QCoreApplication::processEvents();	// forces splashscreen to show up
+	splashScreen.showMessage(rshare.translate("SplashScreen", "Create interface"), Qt::AlignHCenter | Qt::AlignBottom);
+	QCoreApplication::processEvents();	// forces splashscreen to show up
 
-    RsharePeerSettings::Create();
+	RsharePeerSettings::Create();
 
-    Emoticons::load();
-    AvatarDialog::load();
+	Emoticons::load();
+	AvatarDialog::load();
 
-    if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool()) {
-        splashScreen.hide();
+	if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool()) {
+		splashScreen.hide();
 
-        Settings->setValue(QString::fromUtf8("FirstRun"), false);
+		Settings->setValue(QString::fromUtf8("FirstRun"), false);
 
-        SoundManager::initDefault();
+		SoundManager::initDefault();
 
 #ifdef __APPLE__
-        /* For OSX, we set the default to "cleanlooks", as the AQUA style hides some input boxes
-         * only on the first run - as the user might want to change it ;)
-         */
-        QString osx_style("cleanlooks");
-        RsApplication::setStyle(osx_style);
-        Settings->setInterfaceStyle(osx_style);
+		/* For OSX, we set the default to "cleanlooks", as the AQUA style hides some input boxes 
+		 * only on the first run - as the user might want to change it ;)
+		 */
+		QString osx_style("cleanlooks");
+		Rshare::setStyle(osx_style);
+		Settings->setInterfaceStyle(osx_style);
 #endif
 
 // This is now disabled - as it doesn't add very much.
 // Need to make sure that defaults are sensible!
 #ifdef ENABLE_QUICKSTART_WIZARD
-        QuickStartWizard qstartWizard;
-        qstartWizard.exec();
+		QuickStartWizard qstartWizard;
+		qstartWizard.exec();
 #endif
 
-    }
+	}
 
-    MainWindow *w = MainWindow::Create ();
-    splashScreen.finish(w);
+	MainWindow *w = MainWindow::Create ();
+	splashScreen.finish(w);
 
-    if (!sDefaultGXSIdToCreate.isEmpty()) {
-        RsIdentityParameters params;
-        params.nickname = sDefaultGXSIdToCreate.toUtf8().constData();
-        params.isPgpLinked = true;
-        params.mImage.clear();
-        uint32_t token = 0;
-        rsIdentity->createIdentity(token, params);
-    }
-    // I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to
-    // avoid clashes between infos from threads.
-    //
+	w->processLastArgs();
 
-    qRegisterMetaType<RsPeerId>("RsPeerId") ;
+	if (!sDefaultGXSIdToCreate.isEmpty()) {
+		RsIdentityParameters params;
+		params.nickname = sDefaultGXSIdToCreate.toUtf8().constData();
+		params.isPgpLinked = true;
+		params.mImage.clear();
+		uint32_t token = 0;
+		rsIdentity->createIdentity(token, params);
+	}
+	// I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to
+	// avoid clashes between infos from threads.
+	//
+
+	qRegisterMetaType<RsPeerId>("RsPeerId") ;
 #ifdef DEBUG
-    std::cerr << "connecting signals and slots" << std::endl ;
+	std::cerr << "connecting signals and slots" << std::endl ;
 #endif
-    QObject::connect(notify,SIGNAL(deferredSignatureHandlingRequested()),notify,SLOT(handleSignatureEvent()),Qt::QueuedConnection) ;
-    QObject::connect(notify,SIGNAL(chatLobbyTimeShift(int)),notify,SLOT(handleChatLobbyTimeShift(int)),Qt::QueuedConnection) ;
-    QObject::connect(notify,SIGNAL(diskFull(int,int))						,w                   		,SLOT(displayDiskSpaceWarning(int,int))) ;
+	QObject::connect(notify,SIGNAL(deferredSignatureHandlingRequested()),notify,SLOT(handleSignatureEvent()),Qt::QueuedConnection) ;
+	QObject::connect(notify,SIGNAL(chatLobbyTimeShift(int)),notify,SLOT(handleChatLobbyTimeShift(int)),Qt::QueuedConnection) ;
+	QObject::connect(notify,SIGNAL(diskFull(int,int))						,w                   		,SLOT(displayDiskSpaceWarning(int,int))) ;
     QObject::connect(notify,SIGNAL(filesPostModChanged(bool))         ,w                         ,SLOT(postModDirectories(bool)) ,Qt::QueuedConnection        ) ;
-    QObject::connect(notify,SIGNAL(transfersChanged())                ,w->transfersDialog  		,SLOT(insertTransfers()                )) ;
-    QObject::connect(notify,SIGNAL(publicChatChanged(int))            ,w->friendsDialog      		,SLOT(publicChatChanged(int)           ));
-    QObject::connect(notify,SIGNAL(neighboursChanged())               ,w->friendsDialog->networkDialog    		,SLOT(securedUpdateDisplay())) ;
+	QObject::connect(notify,SIGNAL(transfersChanged())                ,w->transfersDialog  		,SLOT(insertTransfers()                )) ;
+	QObject::connect(notify,SIGNAL(publicChatChanged(int))            ,w->friendsDialog      		,SLOT(publicChatChanged(int)           ));
+	QObject::connect(notify,SIGNAL(neighboursChanged())               ,w->friendsDialog->networkDialog    		,SLOT(securedUpdateDisplay())) ;
 
-    QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&,bool)),w->friendsDialog,SLOT(updatePeerStatusString(const QString&,const QString&,bool)));
-    QObject::connect(notify,SIGNAL(ownStatusMessageChanged()),w->friendsDialog,SLOT(loadmypersonalstatus()));
+	QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&,bool)),w->friendsDialog,SLOT(updatePeerStatusString(const QString&,const QString&,bool)));
+	QObject::connect(notify,SIGNAL(ownStatusMessageChanged()),w->friendsDialog,SLOT(loadmypersonalstatus()));
 
 //	QObject::connect(notify,SIGNAL(logInfoChanged(const QString&))		,w->friendsDialog->networkDialog,SLOT(setLogInfo(QString))) ;
-    QObject::connect(notify,SIGNAL(discInfoChanged())						,w->friendsDialog->networkView,SLOT(update()),Qt::QueuedConnection) ;
-    QObject::connect(notify,SIGNAL(errorOccurred(int,int,const QString&)),w,SLOT(displayErrorMessage(int,int,const QString&))) ;
+	QObject::connect(notify,SIGNAL(discInfoChanged())						,w->friendsDialog->networkView,SLOT(update()),Qt::QueuedConnection) ;
+	QObject::connect(notify,SIGNAL(errorOccurred(int,int,const QString&)),w,SLOT(displayErrorMessage(int,int,const QString&))) ;
 
-    w->installGroupChatNotifier();
+	w->installGroupChatNotifier();
 
-    /* only show window, if not startMinimized */
-    if (RsInit::getStartMinimised() || Settings->getStartMinimized())
-    {
-        splashScreen.close();
-    } else {
-        w->show();
-    }
+	/* only show window, if not startMinimized */
+	if (RsInit::getStartMinimised() || Settings->getStartMinimized())
+	{
+		splashScreen.close();
+	} else {
+		w->show();
+	}
 
-    /* Startup a Timer to keep the gui's updated */
-    QTimer *timer = new QTimer(w);
-    timer -> connect(timer, SIGNAL(timeout()), notify, SLOT(UpdateGUI()));
-    timer->start(1000);
+	/* Startup a Timer to keep the gui's updated */
+	QTimer *timer = new QTimer(w);
+	timer -> connect(timer, SIGNAL(timeout()), notify, SLOT(UpdateGUI()));
+	timer->start(1000);
 
-    notify->enable() ;	// enable notification system after GUI creation, to avoid data races in Qt.
+	notify->enable() ;	// enable notification system after GUI creation, to avoid data races in Qt.
 
     // Read webui params in settings. We cannot save them to some webui.cfg because cfg needs the node id and
     // jsonapi is started before node ID selection in retroshare-service.
@@ -770,31 +586,31 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
     RsInit::startupWebServices(conf,false);
 #endif
 
-    /* dive into the endless loop */
-    int ti = rshare.exec();
-    delete w ;
+	/* dive into the endless loop */
+	int ti = rshare.exec();
+	delete w ;
 
 #ifdef RS_JSONAPI
-    JsonApiPage::checkShutdownJsonApi();
+	JsonApiPage::checkShutdownJsonApi();
 #endif // RS_JSONAPI
 
-    /* cleanup */
-    ChatDialog::cleanupChat();
+	/* cleanup */
+	ChatDialog::cleanupChat();
 #ifdef RS_ENABLE_GXS
-    RsGxsUpdateBroadcast::cleanup();
+	RsGxsUpdateBroadcast::cleanup();
 #endif
 
-    if (is_auto_tor) {
-        RsTor::stop();
-    }
+	if (is_auto_tor) {
+		RsTor::stop();
+	}
 
-    RsControl::instance()->rsGlobalShutDown();
+	RsControl::instance()->rsGlobalShutDown();
 
-    delete(soundManager);
-    soundManager = NULL;
+	delete(soundManager);
+	soundManager = NULL;
 
-    Settings->sync();
-    delete(Settings);
+	Settings->sync();
+	delete(Settings);
 
-    return ti ;
+	return ti ;
 }
diff --git a/retroshare-gui/src/qss/retroclassic.qss b/retroshare-gui/src/qss/retroclassic.qss
index eea7fdf25..df8802f3a 100644
--- a/retroshare-gui/src/qss/retroclassic.qss
+++ b/retroshare-gui/src/qss/retroclassic.qss
@@ -184,9 +184,3 @@ QLabel#label_masthead{
 	border: 2px solid #CCCCCC;
 	border-radius: 4px;
 }
-
-PulseReplySeperator QFrame#frame {
-	border: 2px solid #CCCCCC;
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
-	border-radius: 10px}
-}
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 6f217db9c..93734b454 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -304,9 +304,6 @@ macx {
 
 	#DEFINES *= MAC_IDLE # for idle feature
 	CONFIG -= uitools
-
-        OBJECTIVE_SOURCES += gui/common/MacDockIconHandler.mm
-        OBJECTIVE_HEADERS +=  gui/common/MacDockIconHandler.h
 }
 
 ##################################### FreeBSD ######################################
@@ -451,7 +448,6 @@ HEADERS +=  rshare.h \
             util/qtthreadsutils.h \
             util/ClickableLabel.h \
             util/AspectRatioPixmapLabel.h \
-            util/FontSizeHandler.h \
             gui/profile/ProfileWidget.h \
             gui/profile/ProfileManager.h \
             gui/profile/StatusMessage.h \
@@ -520,7 +516,6 @@ HEADERS +=  rshare.h \
             gui/common/vmessagebox.h \
             gui/common/RsUrlHandler.h \
             gui/common/RsCollectionDialog.h \
-            gui/common/RsCollectionModel.h \
             gui/common/rwindow.h \
             gui/common/rshtml.h \
             gui/common/AvatarDefs.h \
@@ -818,7 +813,6 @@ SOURCES +=  main.cpp \
             util/RichTextEdit.cpp \
             util/ClickableLabel.cpp \
             util/AspectRatioPixmapLabel.cpp \
-            util/FontSizeHandler.cpp \
             gui/profile/ProfileWidget.cpp \
             gui/profile/StatusMessage.cpp \
             gui/profile/ProfileManager.cpp \
@@ -848,7 +842,6 @@ SOURCES +=  main.cpp \
             gui/common/ElidedLabel.cpp \
             gui/common/vmessagebox.cpp \
             gui/common/RsCollectionDialog.cpp \
-            gui/common/RsCollectionModel.cpp \
             gui/common/RsUrlHandler.cpp \
             gui/common/rwindow.cpp \
             gui/common/rshtml.cpp \
@@ -1259,7 +1252,6 @@ identities {
 	
 	HEADERS +=  \
 		gui/Identity/IdDialog.h \
-		gui/Identity/IdentityListModel.h \
 		gui/Identity/IdEditDialog.h \
 		gui/Identity/IdDetailsDialog.h \
 	
@@ -1269,7 +1261,6 @@ identities {
 
 	SOURCES +=  \
 		gui/Identity/IdDialog.cpp \
-		gui/Identity/IdentityListModel.cpp \
 		gui/Identity/IdEditDialog.cpp \
 		gui/Identity/IdDetailsDialog.cpp \
 	
diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index d867f1545..e5f450f57 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -50,22 +50,55 @@
 #include <lang/languagesupport.h>
 #include <util/stringutil.h>
 
-#include <util/argstream.h>
 #include <retroshare/rsinit.h>
 #include <retroshare/rsversion.h>
 #include <retroshare/rsplugin.h>
 
 #include "rshare.h"
 
-#ifdef __APPLE__
-QStringList RsApplication::_links;           /**< List of links passed by arguments. */
-QStringList RsApplication::_files;           /**< List of files passed by arguments. */
-#endif
+/* Available command-line arguments. */
+#define ARG_RESET           "reset"         /**< Reset Rshare's saved settings.   */
+#define ARG_DATADIR         "datadir"       /**< Directory to use for data files. */
+#define ARG_LOGFILE         "logfile"       /**< Location of our logfile.         */
+#define ARG_LOGLEVEL        "loglevel"      /**< Log verbosity.                   */
+#define ARG_GUISTYLE        "style"         /**< Argument specfying GUI style.    */
+#define ARG_GUISTYLESHEET   "stylesheet"    /**< Argument specfying GUI style.    */
+#define ARG_LANGUAGE        "lang"          /**< Argument specifying language.    */
+#define ARG_OPMODE_S        "o"             /**< OpMode (Full, NoTurtle, Gaming, Minimal) */
+#define ARG_OPMODE_L        "opmode"        /**< OpMode (Full, NoTurtle, Gaming, Minimal) */
+#define ARG_RSLINK_S        "r"             /**< Open RsLink with protocol retroshare:// */
+#define ARG_RSLINK_L        "link"          /**< Open RsLink with protocol retroshare:// */
+#define ARG_RSFILE_S        "f"             /**< Open RsFile with or without arg.  */
+#define ARG_RSFILE_L        "rsfile"        /**< Open RsFile with or without arg.  */
+//Other defined for server in /libretroshare/src/rsserver/rsinit.cc:351
 
-Log RsApplication::log_output;                     /**< Logs debugging messages to file or stdout. */
-RsGUIConfigOptions RsApplication::options;
-QDateTime          RsApplication::mStartupTime;
-QLocalServer*      RsApplication::localServer;
+// The arguments here can be send to a running instance.
+// If the command line contains arguments not listed here, we have to start a new instance.
+// For example, the user wants to start a second instance using --base-dir arg of libretroshare.
+static const char* const forwardableArgs[] = {
+    ARG_OPMODE_S,
+    ARG_OPMODE_L,
+    ARG_RSLINK_S,
+    ARG_RSLINK_L,
+    ARG_RSFILE_S,
+    ARG_RSFILE_L,
+    NULL,
+};
+
+/* Static member variables */
+QMap<QString, QString> Rshare::_args; /**< List of command-line arguments.  */
+Log Rshare::_log;                     /**< Logs debugging messages to file or stdout. */
+QString Rshare::_style;               /**< The current GUI style.           */
+QString Rshare::_stylesheet;          /**< The current GUI stylesheet.      */
+QString Rshare::_language;            /**< The current language.            */
+QString Rshare::_dateformat;          /**< The format of dates in feed items etc. */
+QString Rshare::_opmode;              /**< The operating mode passed by args. */
+QStringList Rshare::_links;           /**< List of links passed by arguments. */
+QStringList Rshare::_files;           /**< List of files passed by arguments. */
+QDateTime Rshare::mStartupTime;
+bool Rshare::useConfigDir;
+QString Rshare::configDir;
+QLocalServer* Rshare::localServer;
 
 /** Catches debugging messages from Qt and sends them to RetroShare's logs. If Qt
  * emits a QtFatalMsg, we will write the message to the log and then abort().
@@ -100,87 +133,194 @@ void qt_msg_handler(QtMsgType type, const char *msg)
   }
 }
 
-/** Constructor. Parses the command-line arguments, resets RsApplication's
- * configuration (if requested), and sets up the GUI style and language
- * translation.
- * the const_cast below is truely horrible, but it allows to hide these unused argc/argv
- * when initing RsApplication
- */
-
-RsApplication::RsApplication(const RsGUIConfigOptions& conf)
-: QApplication(const_cast<RsGUIConfigOptions*>(&conf)->argc,const_cast<RsGUIConfigOptions*>(&conf)->argv)
+static bool notifyRunningInstance()
 {
-    mStartupTime = QDateTime::currentDateTime();
-    localServer = NULL;
-    options = conf;
+    // Connect to the Local Server of the main process to notify it
+    // that a new process had been started
+    QLocalSocket localSocket;
+    localSocket.connectToServer(QString(TARGET));
+#ifdef DEBUG
+    std::cerr << "Rshare::Rshare waitForConnected to other instance." << std::endl;
+#endif
+    if( localSocket.waitForConnected(100) )
+    {
+#ifdef DEBUG
+      std::cerr << "Rshare::Rshare Connection etablished. Waiting for disconnection." << std::endl;
+#endif
+      localSocket.waitForDisconnected(1000);
+      return true;
+    }
+    else
+    {
+#ifdef DEBUG
+        std::cerr << "Rshare::Rshare failed to connect to other instance." << std::endl;
+#endif
+        return false;
+    }
+}
 
-    // So we start a Local Server to listen for connections from new process
-    localServer= new QLocalServer();
-    QObject::connect(localServer, SIGNAL(newConnection()), this, SLOT(slotConnectionEstablished()));
-    updateLocalServer();
+/** Constructor. Parses the command-line arguments, resets Rshare's
+ * configuration (if requested), and sets up the GUI style and language
+ * translation. */
+Rshare::Rshare(QStringList args, int &argc, char **argv, const QString &dir)
+: QApplication(argc, argv)
+{
+  mStartupTime = QDateTime::currentDateTime();
+  localServer = NULL;
 
-    // clear out any old arguments (race condition?)
-    QSharedMemory newArgs;
-    newArgs.setKey(QString(TARGET) + "_newArgs");
-    if(newArgs.attach(QSharedMemory::ReadWrite))
+  //Initialize connection to LocalServer to know if other process runs.
+  {
+    QString serverName = QString(TARGET);
+
+    // check if another instance is running
+    bool haveRunningInstance = notifyRunningInstance();
+
+    bool sendArgsToRunningInstance = haveRunningInstance;
+    if(args.empty())
+        sendArgsToRunningInstance = false;
+    // if we find non-forwardable args, start a new instance
+    for(int iCurs = 0; iCurs < args.size(); ++iCurs)
+    {
+        const char* const* argit = forwardableArgs;
+        bool found = false;
+        while(*argit && iCurs < args.size())
+        {
+            if(args.value(iCurs) == "-"+QString(*argit) || args.value(iCurs) == "--"+QString(*argit))
+            {
+                found = true;
+                if(argNeedsValue(*argit))
+                    iCurs++;
+            }
+            argit++;
+        }
+        if(!found)
+            sendArgsToRunningInstance = false;
+    }
+
+    if (sendArgsToRunningInstance) {
+      // load into shared memory
+      QBuffer buffer;
+      buffer.open(QBuffer::ReadWrite);
+      QDataStream out(&buffer);
+      out << args;
+      int size = buffer.size();
+
+      QSharedMemory newArgs;
+      newArgs.setKey(serverName + "_newArgs");
+      if (newArgs.isAttached()) newArgs.detach();
+
+      if (!newArgs.create(size)) {
+        std::cerr << "(EE) Rshare::Rshare Unable to create shared memory segment of size:"
+                  << size << " error:" << newArgs.errorString().toStdString() << "." << std::endl;
+#ifdef Q_OS_UNIX
+        std::cerr << "Look with `ipcs -m` for nattch==0 segment. And remove it with `ipcrm -m 'shmid'`." << std::endl;
+        //No need for windows, as it removes shared segment directly even when crash.
+#endif
         newArgs.detach();
+        ::exit(EXIT_FAILURE);
+      }
+      newArgs.lock();
+      char *to = (char*)newArgs.data();
+      const char *from = buffer.data().data();
+      memcpy(to, from, qMin(newArgs.size(), size));
+      newArgs.unlock();
+
+      std::cerr << "Rshare::Rshare waitForConnected to other instance." << std::endl;
+      if(notifyRunningInstance())
+      {
+        newArgs.detach();
+        std::cerr << "Rshare::Rshare Arguments was sended." << std::endl
+                  << " To disable it, in Options - General - Misc," << std::endl
+                  << " uncheck \"Use Local Server to get new Arguments\"." << std::endl;
+        ::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function
+      }
+      else
+          std::cerr << "Rshare::Rshare failed to connect to other instance." << std::endl;
+      newArgs.detach();
+    }
+
+    if(!haveRunningInstance)
+    {
+        // No main process exists
+        // Or started without arguments
+        // So we start a Local Server to listen for connections from new process
+        localServer= new QLocalServer();
+        QObject::connect(localServer, SIGNAL(newConnection()), this, SLOT(slotConnectionEstablished()));
+        updateLocalServer();
+		// clear out any old arguments (race condition?)
+		QSharedMemory newArgs;
+		newArgs.setKey(QString(TARGET) + "_newArgs");
+		if(newArgs.attach(QSharedMemory::ReadWrite))
+			newArgs.detach();
+    }
+  }
 
 #if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
-    qInstallMessageHandler(qt_msg_handler);
+  qInstallMessageHandler(qt_msg_handler);
 #else
-    qInstallMsgHandler(qt_msg_handler);
+  qInstallMsgHandler(qt_msg_handler);
 #endif
 
 #ifndef __APPLE__
 
-    /* set default window icon */
-    setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
+  /* set default window icon */
+  setWindowIcon(FilesDefs::getIconFromQtResourcePath(":/icons/logo_128.png"));
 
 #endif
 
-    mBlink = true;
-    QTimer *timer = new QTimer(this);
-    timer->setInterval(500);
-    connect(timer, SIGNAL(timeout()), this, SLOT(blinkTimer()));
-    timer->start();
+  mBlink = true;
+  QTimer *timer = new QTimer(this);
+  timer->setInterval(500);
+  connect(timer, SIGNAL(timeout()), this, SLOT(blinkTimer()));
+  timer->start();
 
-    timer = new QTimer(this);
-    timer->setInterval(60000);
-    connect(timer, SIGNAL(timeout()), this, SIGNAL(minuteTick()));
-    timer->start();
+  timer = new QTimer(this);
+  timer->setInterval(60000);
+  connect(timer, SIGNAL(timeout()), this, SIGNAL(minuteTick()));
+  timer->start();
 
-    /* Check if we're supposed to reset our config before proceeding. */
-    if (options.optResetParams)
-    {
-        RsInfo() << "Resetting Retroshare config parameters, as requested (option -R)";
-        Settings->reset();
-    }
+  /* Read in all our command-line arguments. */
+  parseArguments(args);
 
-    /* Handle the -loglevel and -logfile options. */
-    if (options.logLevel != "Off")
-    {
-        if (!options.logFileName.isNull())
-            log_output.open(options.logFileName);
-        else
-            log_output.open(stdout);
+  /* Check if we're supposed to reset our config before proceeding. */
+  if (_args.contains(ARG_RESET)) {
+    Settings->reset();
+  }
+  
+  /* Handle the -loglevel and -logfile options. */
+  if (_args.contains(ARG_LOGFILE))
+    _log.open(_args.value(ARG_LOGFILE));
+  if (_args.contains(ARG_LOGLEVEL)) {
+    _log.setLogLevel(Log::stringToLogLevel(
+                      _args.value(ARG_LOGLEVEL)));
+    if (!_args.contains(ARG_LOGFILE))
+      _log.open(stdout);
+  }
+  if (!_args.contains(ARG_LOGLEVEL) && 
+      !_args.contains(ARG_LOGFILE))
+    _log.setLogLevel(Log::Off);
 
-        log_output.setLogLevel(Log::stringToLogLevel(options.logLevel));
-    }
+  /* config directory */
+  useConfigDir = false;
+  if (dir != "")
+  {
+  	setConfigDirectory(dir);
+  }
 
-    /** Initialize support for language translations. */
-    //LanguageSupport::initialize();
+  /** Initialize support for language translations. */
+  //LanguageSupport::initialize();
 
-    resetLanguageAndStyle();
+  resetLanguageAndStyle();
 
-    /* Switch off auto shutdown */
-    setQuitOnLastWindowClosed ( false );
+  /* Switch off auto shutdown */
+  setQuitOnLastWindowClosed ( false );
 
-    /* Initialize GxsIdDetails */
-    GxsIdDetails::initialize();
+	/* Initialize GxsIdDetails */
+	GxsIdDetails::initialize();
 }
 
 /** Destructor */
-RsApplication::~RsApplication()
+Rshare::~Rshare()
 {
 	/* Cleanup GxsIdDetails */
 	GxsIdDetails::cleanup();
@@ -194,7 +334,7 @@ RsApplication::~RsApplication()
 /**
  * @brief Executed when new instance connect command is sent to LocalServer
  */
-void RsApplication::slotConnectionEstablished()
+void Rshare::slotConnectionEstablished()
 {
 	QSharedMemory newArgs;
 	newArgs.setKey(QString(TARGET) + "_newArgs");
@@ -206,7 +346,7 @@ void RsApplication::slotConnectionEstablished()
 		/* this is not an error. It just means we were notified to check
 		   newArgs, but none had been set yet.
 		   TODO: implement separate ping/take messages
-           std::cerr << "(EE) RsApplication::slotConnectionEstablished() Unable to attach to shared memory segment."
+		   std::cerr << "(EE) Rshare::slotConnectionEstablished() Unable to attach to shared memory segment."
 		   << newArgs.errorString().toStdString() << std::endl;
 		   */
 		socket->close();
@@ -217,41 +357,36 @@ void RsApplication::slotConnectionEstablished()
 	socket->close();
 	delete socket;
 
-    if(newArgs.error())
-    {
-        RsErr() << "Something when wrong in receiving arguments from operating system: " << newArgs.errorString().toStdString() ;
-        return ;
-    }
-    QBuffer buffer;
-    QDataStream in(&buffer);
-    QStringList args;
+	QBuffer buffer;
+	QDataStream in(&buffer);
+	QStringList args;
 
-    newArgs.lock();
-    buffer.setData((char*)newArgs.constData(), newArgs.size());
-    buffer.open(QBuffer::ReadOnly);
-    in >> args;
-    newArgs.unlock();
-    newArgs.detach();
+	newArgs.lock();
+	buffer.setData((char*)newArgs.constData(), newArgs.size());
+	buffer.open(QBuffer::ReadOnly);
+	in >> args;
+	newArgs.unlock();
+	newArgs.detach();
 
-    emit newArgsReceived(args);
-    while (!args.empty())
-    {
-        std::cerr << "RsApplication::slotConnectionEstablished args:" << QString(args.takeFirst()).toStdString() << std::endl;
-    }
+	emit newArgsReceived(args);
+	while (!args.empty())
+	{
+		std::cerr << "Rshare::slotConnectionEstablished args:" << QString(args.takeFirst()).toStdString() << std::endl;
+	}
 }
 
-QString RsApplication::retroshareVersion(bool) { return RS_HUMAN_READABLE_VERSION; }
+QString Rshare::retroshareVersion(bool) { return RS_HUMAN_READABLE_VERSION; }
 
 /** Enters the main event loop and waits until exit() is called. The signal
  * running() will be emitted when the event loop has started. */
 int
-RsApplication::run()
+Rshare::run()
 {
   QTimer::singleShot(0, rApp, SLOT(onEventLoopStarted()));
   return rApp->exec();
 }
 
-QDateTime RsApplication::startupTime()
+QDateTime Rshare::startupTime()
 {
   return mStartupTime;
 }
@@ -260,17 +395,203 @@ QDateTime RsApplication::startupTime()
  * will emit the running() signal to indicate that the application's event
  * loop is running. */
 void
-RsApplication::onEventLoopStarted()
+Rshare::onEventLoopStarted()
 {
   emit running();
 }
 
+/** Display usage information regarding command-line arguments. */
+/*void
+Rshare::printUsage(QString errmsg)
+{
+  QTextStream out(stdout);*/
+
+  /* If there was an error message, print it out. */
+  /*if (!errmsg.isEmpty()) {
+    out << "** " << errmsg << " **" << endl << endl;
+  }*/
+
+  /* Now print the application usage */
+  //out << "Usage: " << endl;
+  //out << "\t" << qApp->arguments().at(0) << " [options]"    << endl;
+
+  /* And available options */
+  //out << endl << "Available Options:"                                   << endl;
+  //out << "\t-"ARG_RESET"\t\tResets ALL stored Rshare settings."        << endl;
+  //out << "\t-"ARG_DATADIR"\tSets the directory Rshare uses for data files"<< endl;
+  //out << "\t-"ARG_GUISTYLE"\t\tSets Rshare's interface style."         << endl;
+  //out << "\t-"ARG_GUISTYLESHEET"\t\tSets Rshare's stylesheet."         << endl;
+  //out << "\t\t\t[" << QStyleFactory::keys().join("|") << "]"            << endl;
+  //out << "\t-"ARG_LANGUAGE"\t\tSets Rshare's language."                << endl;
+  //out << "\t\t\t[" << LanguageSupport::languageCodes().join("|") << "]" << endl;
+//}
+
+/** Displays usage information for command-line args. */
+void
+Rshare::showUsageMessageBox()
+{
+  QString usage;
+  QTextStream out(&usage);
+
+  out << "Available Options:" << endl;
+  out << "<table>";
+  //out << trow(tcol("-"ARG_HELP) + 
+  //            tcol(tr("Displays this usage message and exits.")));
+  out << trow(tcol("-" ARG_RESET) +
+              tcol(tr("Resets ALL stored RetroShare settings.")));
+  out << trow(tcol("-" ARG_DATADIR" &lt;dir&gt;") +
+              tcol(tr("Sets the directory RetroShare uses for data files.")));
+  out << trow(tcol("-" ARG_LOGFILE" &lt;" + tr("filename") + "&gt;") +
+              tcol(tr("Sets the name and location of RetroShare's logfile.")));
+  out << trow(tcol("-" ARG_LOGLEVEL" &lt;" + tr("level") + "&gt;") +
+              tcol(tr("Sets the verbosity of RetroShare's logging.") +
+                   "<br>[" + Log::logLevels().join("|") +"]"));
+  out << trow(tcol("-" ARG_GUISTYLE" &lt;" + tr("style") +"&gt;") +
+              tcol(tr("Sets RetroShare's interface style.") +
+                   "<br>[" + QStyleFactory::keys().join("|") + "]"));
+  out << trow(tcol("-" ARG_GUISTYLESHEET" &lt;" + tr("stylesheet") + "&gt;") +
+              tcol(tr("Sets RetroShare's interface stylesheets.")));
+  out << trow(tcol("-" ARG_LANGUAGE" &lt;" + tr("language") + "&gt;") +
+              tcol(tr("Sets RetroShare's language.") +
+                   "<br>[" + LanguageSupport::languageCodes().join("|") + "]"));
+  out << trow(tcol("--" ARG_OPMODE_L" &lt;" + tr("opmode") + "&gt;") +
+              tcol(tr("Sets RetroShare's operating mode.") +
+                   "<br>[full|noturtle|gaming|minimal]"));
+  out << trow(tcol("-" ARG_RSLINK_L" &lt;" + tr("RsLinkURL") + "&gt;") +
+              tcol(tr("Open RsLink with protocol retroshare://")));
+  out << trow(tcol("-" ARG_RSFILE_L" &lt;" + tr("filename") + "&gt;") +
+              tcol(tr("Open RsFile with or without arg.")));
+  out << "</table>";
+
+  VMessageBox::information(0, 
+    tr("RetroShare GUI Usage Information"), usage, VMessageBox::Ok);
+}
+
+/** Returns true if the specified argument expects a value. */
+bool
+Rshare::argNeedsValue(const QString &argName)
+{
+	return (
+	        argName == ARG_DATADIR  ||
+	        argName == ARG_LOGFILE  ||
+	        argName == ARG_LOGLEVEL ||
+	        argName == ARG_GUISTYLE ||
+	        argName == ARG_GUISTYLESHEET ||
+	        argName == ARG_LANGUAGE ||
+	        argName == ARG_OPMODE_S ||
+	        argName == ARG_OPMODE_L ||
+	        argName == ARG_RSLINK_S ||
+	        argName == ARG_RSLINK_L ||
+	        argName == ARG_RSFILE_S ||
+	        argName == ARG_RSFILE_L   );
+}
+
+/** Parses the list of command-line arguments for their argument names and
+ * values. */
+void
+Rshare::parseArguments(QStringList args, bool firstRun)
+{
+	QString arg, argl, value;
+
+	/* Loop through all command-line args/values and put them in a map */
+	for (int iCurs = 0; iCurs < args.size(); ++iCurs) {
+		/* Get the argument name and set a blank value */
+		arg = args.at(iCurs);//.toLower(); Need Upper case for file name.
+		argl = arg.toLower();
+		if (argl == "empty") continue;
+		value = "";
+
+		/* Check if it starts with a - or -- */
+		if (arg.startsWith("-")) {
+			arg = arg.mid((arg.startsWith("--") ? 2 : 1));
+			/* Check if it takes a value and there is one on the command-line */
+			if (iCurs < args.size()-1 && argNeedsValue(arg)) {
+				value = args.at(++iCurs);
+			}
+		} else {
+			/* Check if links or files without arg */
+			if (argl.startsWith("retroshare://")) {
+				value = arg;
+				arg = ARG_RSLINK_L;
+			} else {
+				if (QFile(arg).exists()) {
+					value = arg;
+					arg = ARG_RSFILE_L;
+				}
+			}
+		}
+
+		/* handle opmode that could be change while running.*/
+		QString omValue = QString(value).prepend(";").append(";").toLower();
+		QString omValues = QString(";full;noturtle;gaming;minimal;");
+		if ((arg == ARG_OPMODE_S || arg == ARG_OPMODE_L )
+		    && omValues.contains(omValue)) {
+			_opmode = value;
+		}
+
+		/* Don't send theses argument to _args map to allow multiple. */
+		if (arg == ARG_RSLINK_S || arg == ARG_RSLINK_L) {
+			_links.append(value);
+		} else if (arg == ARG_RSFILE_S || arg == ARG_RSFILE_L) {
+			_files.append(value);
+		} else if (firstRun) {
+			/* Place this arg/value in the map only first time*/
+			_args.insert(arg, value);
+		}
+	}
+}
+
+/** Verifies that all specified arguments were valid. */
+bool
+Rshare::validateArguments(QString &errmsg)
+{
+  /* Check for a writable log file */
+  if (_args.contains(ARG_LOGFILE) && !_log.isOpen()) {
+    errmsg = tr("Unable to open log file '%1': %2")
+                           .arg(  _args.value(ARG_LOGFILE)
+                                , _log.errorString());
+    return false;
+  }
+  /* Check for a valid log level */
+  if (_args.contains(ARG_LOGLEVEL) &&
+      !Log::logLevels().contains(_args.value(ARG_LOGLEVEL))) {
+    errmsg = tr("Invalid log level specified:")+" " + _args.value(ARG_LOGLEVEL);
+    return false;
+  }
+  /* Check for a valid GUI style */
+  if (_args.contains(ARG_GUISTYLE) &&
+      !QStyleFactory::keys().contains(_args.value(ARG_GUISTYLE),
+                                      Qt::CaseInsensitive)) {
+    errmsg = tr("Invalid GUI style specified:")+" " + _args.value(ARG_GUISTYLE);
+    return false;
+  }
+  /* Check for a language that Retroshare recognizes. */
+  if (_args.contains(ARG_LANGUAGE) &&
+      !LanguageSupport::isValidLanguageCode(_args.value(ARG_LANGUAGE))) {
+    errmsg = tr("Invalid language code specified:")+" " + _args.value(ARG_LANGUAGE);
+    return false;
+  }
+  /* Check for an opmode that Retroshare recognizes. */
+  if (_args.contains(ARG_OPMODE_S) &&
+      !QString(";full;noturtle;gaming;minimal;").contains(QString(_args.value(ARG_OPMODE_S)).prepend(";").append(";").toLower())) {
+    errmsg = tr("Invalid operating mode specified:")+" " + _args.value(ARG_OPMODE_S);
+    return false;
+  }
+  /* Check for an opmode that Retroshare recognizes. */
+  if (_args.contains(ARG_OPMODE_L) &&
+      !QString(";full;noturtle;gaming;minimal;").contains(QString(_args.value(ARG_OPMODE_L)).prepend(";").append(";").toLower())) {
+    errmsg = tr("Invalid operating mode specified:")+" " + _args.value(ARG_OPMODE_L);
+    return false;
+  }
+  return true;
+}
+
 /** Sets the translation RetroShare will use. If one was specified on the
  * command-line, we will use that. Otherwise, we'll check to see if one was
  * saved previously. If not, we'll default to one appropriate for the system
  * locale. */
 bool
-RsApplication::setLanguage(QString languageCode)
+Rshare::setLanguage(QString languageCode)
 {
   /* If the language code is empty, use the previously-saved setting */
   if (languageCode.isEmpty()) {
@@ -278,7 +599,7 @@ RsApplication::setLanguage(QString languageCode)
   }
   /* Translate into the desired language */
   if (LanguageSupport::translate(languageCode)) {
-    options.language = languageCode;
+    _language = languageCode;
     return true;
   }
   return false;
@@ -289,7 +610,7 @@ RsApplication::setLanguage(QString languageCode)
  * saved previously. If not, we'll default to the system
  * locale. */
 bool
-RsApplication::setLocale(QString languageCode)
+Rshare::setLocale(QString languageCode)
 {
   bool retVal = false;
   /* If the language code is empty, use the previously-saved setting */
@@ -305,20 +626,20 @@ RsApplication::setLocale(QString languageCode)
 }
 
 /** customize date format for feeds etc. */
-void RsApplication::customizeDateFormat()
+void Rshare::customizeDateFormat()
 {
   QLocale locale = QLocale(); // set to default locale
   /* get long date format without weekday */
-  options.dateformat = locale.dateFormat(QLocale::LongFormat);
-  options.dateformat.replace(QRegExp("^dddd,*[^ ]* *('[^']+' )*"), "");
-  options.dateformat.replace(QRegExp(",* *dddd"), "");
-  options.dateformat = options.dateformat.trimmed();
+  _dateformat = locale.dateFormat(QLocale::LongFormat);
+  _dateformat.replace(QRegExp("^dddd,*[^ ]* *('[^']+' )*"), "");
+  _dateformat.replace(QRegExp(",* *dddd"), "");
+  _dateformat = _dateformat.trimmed();
 }
 
 /** Get custom date format (defaultlongformat) */
-QString RsApplication::customDateFormat()
+QString Rshare::customDateFormat()
 {
-    return options.dateformat;
+    return _dateformat;
 }
 
 /** Sets the GUI style RetroShare will use. If one was specified on the
@@ -326,50 +647,49 @@ QString RsApplication::customDateFormat()
  * saved previously. If not, we'll default to one appropriate for the
  * operating system. */
 bool
-RsApplication::setStyle(QString styleKey)
+Rshare::setStyle(QString styleKey)
 {
   /* If no style was specified, use the previously-saved setting */
   if (styleKey.isEmpty()) {
     styleKey = Settings->getInterfaceStyle();
   }
   /* Apply the specified GUI style */
-  if (QApplication::setStyle(styleKey))
-  {
-    options.guiStyle = styleKey;
+  if (QApplication::setStyle(styleKey)) {
+    _style = styleKey;
     return true;
   }
   return false;
 }
 
 bool
-RsApplication::setSheet(QString sheet)
+Rshare::setSheet(QString sheet)
 {
   /* If no stylesheet was specified, use the previously-saved setting */
   if (sheet.isEmpty()) {
     sheet = Settings->getSheetName();
   }
   /* Apply the specified GUI stylesheet */
-    options.guiStyleSheetFile = sheet;
+    _stylesheet = sheet;
 
     /* load the StyleSheet*/
-    loadStyleSheet(options.guiStyleSheetFile);
+    loadStyleSheet(_stylesheet);
 
     return true;
 }
 
-void RsApplication::resetLanguageAndStyle()
+void Rshare::resetLanguageAndStyle()
 {
     /** Translate the GUI to the appropriate language. */
-    setLanguage(options.language);
+    setLanguage(_args.value(ARG_LANGUAGE));
 
     /** Set the locale appropriately. */
-    setLocale(options.language);
+    setLocale(_args.value(ARG_LANGUAGE));
 
    /** Set the GUI style appropriately. */
-    setStyle(options.guiStyle);
+    setStyle(_args.value(ARG_GUISTYLE));
 
     /** Set the GUI stylesheet appropriately. */
-    setSheet(options.guiStyleSheetFile);
+    setSheet(_args.value(ARG_GUISTYLESHEET));
 }
 
 // RetroShare:
@@ -394,7 +714,7 @@ void RsApplication::resetLanguageAndStyle()
 //   Language depended stylesheet
 //     <Internal|External>_<locale>.lqss
 
-void RsApplication::loadStyleSheet(const QString &sheetName)
+void Rshare::loadStyleSheet(const QString &sheetName)
 {
     QString locale = QLocale().name();
     QString styleSheet;
@@ -465,7 +785,7 @@ void RsApplication::loadStyleSheet(const QString &sheetName)
 }
 
 /** get list of available stylesheets **/
-void RsApplication::getAvailableStyleSheets(QMap<QString, QString> &styleSheets)
+void Rshare::getAvailableStyleSheets(QMap<QString, QString> &styleSheets)
 {
 	QFileInfoList fileInfoList = QDir(":/qss/stylesheet/").entryInfoList(QStringList("*.qss"));
 	QFileInfo fileInfo;
@@ -493,7 +813,7 @@ void RsApplication::getAvailableStyleSheets(QMap<QString, QString> &styleSheets)
 	}
 }
 
-void RsApplication::refreshStyleSheet(QWidget *widget, bool processChildren)
+void Rshare::refreshStyleSheet(QWidget *widget, bool processChildren)
 {
 	if (widget != NULL) {
 		// force widget to recalculate valid style
@@ -519,35 +839,40 @@ void RsApplication::refreshStyleSheet(QWidget *widget, bool processChildren)
 }
 
 /** Initialize plugins. */
-void RsApplication::initPlugins()
+void Rshare::initPlugins()
 {
-    loadStyleSheet(options.guiStyleSheetFile);
-    LanguageSupport::translatePlugins(options.language);
+    loadStyleSheet(_stylesheet);
+    LanguageSupport::translatePlugins(_language);
 }
 
 /** Returns the directory RetroShare uses for its data files. */
-QString RsApplication::dataDirectory()
+QString
+Rshare::dataDirectory()
 {
-    if(!options.optBaseDir.empty())
-        return QString::fromUtf8(options.optBaseDir.c_str());
-    else
-        return defaultDataDirectory();
+  if (useConfigDir)
+  {
+    return configDir;
+  }
+  else if (_args.contains(ARG_DATADIR)) {
+    return _args.value(ARG_DATADIR);
+  }
+  return defaultDataDirectory();
 }
 
 /** Returns the default location of RetroShare's data directory. */
 QString
-RsApplication::defaultDataDirectory()
+Rshare::defaultDataDirectory()
 {
 #if defined(Q_OS_WIN)
   return (win32_app_data_folder() + "\\RetroShare");
 #else
-  return (QDir::homePath() + "/.retroshare");
+  return (QDir::homePath() + "/.RetroShare");
 #endif
 }
 
-/** Creates RsApplication's data directory, if it doesn't already exist. */
+/** Creates Rshare's data directory, if it doesn't already exist. */
 bool
-RsApplication::createDataDirectory(QString *errmsg)
+Rshare::createDataDirectory(QString *errmsg)
 {
   QDir datadir(dataDirectory());
   if (!datadir.exists()) {
@@ -560,29 +885,33 @@ RsApplication::createDataDirectory(QString *errmsg)
   return true;
 }
 
-/** Set RsApplication's data directory - externally */
-bool RsApplication::setConfigDirectory(const QString& dir)
+/** Set Rshare's data directory - externally */
+bool Rshare::setConfigDirectory(const QString& dir)
 {
-  options.optBaseDir = std::string(dir.toUtf8());
+  useConfigDir = true;
+  configDir = dir;
   return true;
 }
 
 /** Writes <b>msg</b> with severity <b>level</b> to RetroShare's log. */
-Log::LogMessage RsApplication::log(Log::LogLevel level, QString msg)
+Log::LogMessage
+Rshare::log(Log::LogLevel level, QString msg)
 {
-  return log_output.log(level, msg);
+  return _log.log(level, msg);
 }
 
 /** Creates and binds a shortcut such that when <b>key</b> is pressed in
  * <b>sender</b>'s context, <b>receiver</b>'s <b>slot</b> will be called. */
-void RsApplication::createShortcut(const QKeySequence &key, QWidget *sender, QWidget *receiver, const char *slot)
+void
+Rshare::createShortcut(const QKeySequence &key, QWidget *sender,
+                        QWidget *receiver, const char *slot)
 {
   QShortcut *s = new QShortcut(key, sender);
   connect(s, SIGNAL(activated()), receiver, slot);
 }
 
 #ifdef __APPLE__
-bool RsApplication::event(QEvent *event)
+bool Rshare::event(QEvent *event)
 {
   switch (event->type()) {
     case QEvent::FileOpen:{
@@ -604,7 +933,7 @@ bool RsApplication::event(QEvent *event)
 }
 #endif
 
-void RsApplication::blinkTimer()
+void Rshare::blinkTimer()
 {
     mBlink = !mBlink;
     emit blink(mBlink);
@@ -615,7 +944,7 @@ void RsApplication::blinkTimer()
     }
 }
 
-bool RsApplication::loadCertificate(const RsPeerId &accountId, bool autoLogin)
+bool Rshare::loadCertificate(const RsPeerId &accountId, bool autoLogin)
 {
 	if (!RsAccounts::SelectAccount(accountId))
 	{
@@ -656,14 +985,14 @@ bool RsApplication::loadCertificate(const RsPeerId &accountId, bool autoLogin)
         //										QObject::tr("Login Failure"),
         //										QObject::tr("Maybe password is wrong") );
         return false;
-    default: std::cerr << "RsApplication::loadCertificate() unexpected switch value " << retVal << std::endl;
+    default: std::cerr << "Rshare::loadCertificate() unexpected switch value " << retVal << std::endl;
         return false;
     }
 
 	return true;
 }
 
-bool RsApplication::updateLocalServer()
+bool Rshare::updateLocalServer()
 {
 	if (localServer) {
 		QString serverName = QString(TARGET);
diff --git a/retroshare-gui/src/rshare.h b/retroshare-gui/src/rshare.h
index be6af336c..2b59b7875 100644
--- a/retroshare-gui/src/rshare.h
+++ b/retroshare-gui/src/rshare.h
@@ -36,10 +36,9 @@
 #include "util/log.h"
 
 #include "retroshare/rstypes.h"
-#include "retroshare/rsinit.h"
 
 /** Pointer to this RetroShare application instance. */
-#define rApp  (static_cast<RsApplication *>(qApp))
+#define rApp  (static_cast<Rshare *>(qApp))
 
 #define rDebug(fmt)   (rApp->log(Log::Debug, (fmt)))
 #define rInfo(fmt)    (rApp->log(Log::Info, (fmt)))
@@ -47,40 +46,33 @@
 #define rWarn(fmt)    (rApp->log(Log::Warn, (fmt)))
 #define rError(fmt)   (rApp->log(Log::Error, (fmt)))
 
-struct RsGUIConfigOptions: public RsConfigOptions
-{
-    RsGUIConfigOptions()
-        : optResetParams(false), logLevel("Off"), argc(0)
-    {}
 
-    bool optResetParams;		// reset all GUI parameters
-
-    QString dateformat;         // The format for dates in feed items etc.
-    QString language;           // The current language.
-
-    QString logFileName;		// output filename for log
-    QString logLevel;			// severity threshold for log output
-
-    QString guiStyle;           // CSS Style for the GUI
-    QString guiStyleSheetFile;  // CSS Style for the GUI
-
-    int argc ;					// stores argc parameter. Only used by the creator of QApplication
-    char *argv[1] ;				// stores argv parameter. Only used by the creator of QApplication
-};
-
-class RsApplication : public QApplication
+class Rshare : public QApplication
 {
   Q_OBJECT
 
 public:
   /** Constructor. */
-  RsApplication(const RsGUIConfigOptions& conf);
+  Rshare(QStringList args, int &argc, char **argv, const QString &dir);
   /** Destructor. */
-  ~RsApplication();
+  ~Rshare();
 
   /** Return the version info */
   static QString retroshareVersion(bool=true);
 
+  /** Return the map of command-line arguments and values. */
+  static QMap<QString, QString> arguments() { return _args; }
+  /** Parse the list of command-line arguments. */
+  static void parseArguments(QStringList args, bool firstRun = true);
+  /** Validates that all arguments were well-formed. */
+  bool validateArguments(QString &errmsg);
+  /** Prints usage information to the given text stream. */
+  //void printUsage(QString errmsg = QString());
+  /** Displays usage information for command-line args. */
+  static void showUsageMessageBox();
+  /** Returns true if the user wants to see usage information. */
+  static bool showUsage();
+
   /** Sets the current language. */
   static bool setLanguage(QString languageCode = QString());
   /** Sets the current locale. */
@@ -113,22 +105,17 @@ public:
   static void initPlugins();
 
   /** Returns the current GUI style. */
-  static QString style() { return options.guiStyle; }
+  static QString style() { return _style; }
   /** Returns the current GUI stylesheet. */
-  static QString stylesheet() { return options.guiStyleSheetFile; }
+  static QString stylesheet() { return _stylesheet; }
   /** Returns the current language. */
-  static QString language() { return options.language; }
-
-  /** Sets/Returns the operating mode. */
-  static void setOpMode(const QString& op ) { options.opModeStr = op.toStdString(); }
-  static QString opmode() { return QString::fromStdString(options.opModeStr); }
-
-#ifdef __APPLE__
+  static QString language() { return _language; }
+	/** Returns the operating mode. */
+  static QString opmode() { return _opmode; }
   /** Returns links passed by arguments. */
   static QStringList* links() { return &_links; }
   /** Returns files passed by arguments. */
   static QStringList* files()  {return &_files; }
-#endif
   /** Returns Rshare's application startup time. */
   static QDateTime startupTime();
 
@@ -189,20 +176,24 @@ private:
   /** customize the date format (defaultlongformat) */
   static void customizeDateFormat();
 
-#ifdef TO_REMOVE
   /** Returns true if the specified arguments wants a value. */
   static bool argNeedsValue(const QString &argName);
-#endif
 
-#ifdef __APPLE__
+  static QMap<QString, QString> _args; /**< List of command-line arguments.  */
+  static Log _log;                     /**< Logs debugging messages to file or stdout. */
+  static QString _style;               /**< The current GUI style.           */
+  static QString _stylesheet;          /**< The current GUI stylesheet.      */
+  static QString _language;            /**< The current language.            */
+  static QString _dateformat;          /**< The format for dates in feed items etc. */
+  static QString _opmode;              /**< The operating mode passed by args. */
   static QStringList _links;           /**< List of links passed by arguments. */
   static QStringList _files;           /**< List of files passed by arguments. */
-#endif
   static QDateTime mStartupTime;       // startup time
+
+  static bool    useConfigDir;
+  static QString configDir;
   bool mBlink;
   static QLocalServer* localServer;
-  static RsGUIConfigOptions options;
-  static Log log_output;
 };
 
 #endif
diff --git a/retroshare-gui/src/util/ClickableLabel.cpp b/retroshare-gui/src/util/ClickableLabel.cpp
index ee16abdc8..6bbd5ca4a 100644
--- a/retroshare-gui/src/util/ClickableLabel.cpp
+++ b/retroshare-gui/src/util/ClickableLabel.cpp
@@ -33,21 +33,3 @@ ClickableLabel::~ClickableLabel() {
 void ClickableLabel::mousePressEvent(QMouseEvent* /*event*/) {
     emit clicked();
 }
-
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
-void ClickableLabel::enterEvent(QEnterEvent* /*event*/)
-#else
-void ClickableLabel::enterEvent(QEvent* /*event*/)
-#endif
-{
-    if (mUseStyleSheet) {
-        setStyleSheet("QLabel { border: 2px solid #039bd5; }");
-    }
-}
-
-void ClickableLabel::leaveEvent(QEvent* /*event*/)
-{
-    if (mUseStyleSheet) {
-        setStyleSheet("");
-    }
-}
diff --git a/retroshare-gui/src/util/ClickableLabel.h b/retroshare-gui/src/util/ClickableLabel.h
index 610a1eabd..54b3499d8 100644
--- a/retroshare-gui/src/util/ClickableLabel.h
+++ b/retroshare-gui/src/util/ClickableLabel.h
@@ -39,12 +39,8 @@ signals:
 protected:
     void mousePressEvent(QMouseEvent* event) override;
 
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
-    void enterEvent(QEnterEvent* event) override;
-#else
-    void enterEvent(QEvent* event) override;
-#endif
-    void leaveEvent(QEvent* event) override;
+    void enterEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("QLabel { border: 2px solid #039bd5; }");}
+    void leaveEvent(QEvent * /* ev */ ) override { if(mUseStyleSheet) setStyleSheet("");}
 
     bool mUseStyleSheet;
 };
diff --git a/retroshare-gui/src/util/DateTime.cpp b/retroshare-gui/src/util/DateTime.cpp
index 658772c5a..b93a4dfe1 100644
--- a/retroshare-gui/src/util/DateTime.cpp
+++ b/retroshare-gui/src/util/DateTime.cpp
@@ -30,7 +30,7 @@ QString DateTime::formatLongDate(time_t dateValue)
 
 QString DateTime::formatLongDate(const QDate &dateValue)
 {
-	QString customDateFormat = RsApplication::customDateFormat();
+	QString customDateFormat = Rshare::customDateFormat();
 
 	if (customDateFormat.isEmpty()) {
 		return dateValue.toString(Qt::ISODate);
diff --git a/retroshare-gui/src/util/FontSizeHandler.cpp b/retroshare-gui/src/util/FontSizeHandler.cpp
deleted file mode 100644
index c184da0de..000000000
--- a/retroshare-gui/src/util/FontSizeHandler.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * util/FontSizeHandler.cpp                                                    *
- *                                                                             *
- * Copyright (C) 2025, Retroshare Team <retroshare.project@gmail.com>          *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License as              *
- * published by the Free Software Foundation, either version 3 of the          *
- * License, or (at your option) any later version.                             *
- *                                                                             *
- * This program is distributed in the hope that it will be useful,             *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
- * GNU Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include <QMap>
-#include <QWidget>
-#include <QAbstractItemView>
-
-#include "rshare.h"
-#include "FontSizeHandler.h"
-#include "gui/settings/rsharesettings.h"
-#include "gui/notifyqt.h"
-
-// Data for QAbstractItemView
-struct FontSizeHandlerWidgetData
-{
-	std::function<void(QWidget*, int)> callback;
-};
-
-// Data for QWidget
-struct FontSizeHandlerViewData
-{
-	float iconHeightFactor;
-	std::function<void(QAbstractItemView*, int)> callback;
-};
-
-class FontSizeHandlerObject : public QObject
-{
-public:
-	FontSizeHandlerObject(FontSizeHandlerBase *fontSizeHandler): QObject()
-	{
-		mFontSizeHandlerBase = fontSizeHandler;
-	}
-
-	bool eventFilter(QObject* object, QEvent* event)
-	{
-		if (event->type() == QEvent::StyleChange) {
-			QMap<QAbstractItemView*, FontSizeHandlerViewData>::iterator itView = mView.find((QAbstractItemView*) object);
-			if (itView != mView.end()) {
-				mFontSizeHandlerBase->updateFontSize(itView.key(), itView.value().iconHeightFactor, itView.value().callback);
-			}
-
-			QMap<QWidget*, FontSizeHandlerWidgetData>::iterator itWidget = mWidget.find((QWidget*) object);
-			if (itWidget != mWidget.end()) {
-				mFontSizeHandlerBase->updateFontSize(itWidget.key(), itWidget.value().callback);
-			}
-		}
-
-		return false;
-	}
-
-	void registerFontSize(QWidget *widget, std::function<void(QWidget*, int)> callback)
-	{
-		FontSizeHandlerWidgetData data;
-		data.callback = callback;
-		mWidget.insert(widget, data);
-
-		QObject::connect(NotifyQt::getInstance(), &NotifyQt::settingsChanged, widget, [this, widget, callback]() {
-			mFontSizeHandlerBase->updateFontSize(widget, callback);
-		});
-
-		widget->installEventFilter(this);
-		QObject::connect(widget, &QObject::destroyed, this, [this, widget](QObject *object) {
-			if (widget == object) {
-				mWidget.remove(widget);
-				widget->removeEventFilter(this);
-			}
-		});
-
-		mFontSizeHandlerBase->updateFontSize(widget, callback, true);
-	}
-
-	void registerFontSize(QAbstractItemView *view, float iconHeightFactor, std::function<void(QAbstractItemView*, int)> callback)
-	{
-		FontSizeHandlerViewData data;
-		data.iconHeightFactor = iconHeightFactor;
-		data.callback = callback;
-		mView.insert(view, data);
-
-		QObject::connect(NotifyQt::getInstance(), &NotifyQt::settingsChanged, view, [this, view, iconHeightFactor, callback]() {
-			mFontSizeHandlerBase->updateFontSize(view, iconHeightFactor, callback);
-		});
-
-		view->installEventFilter(this);
-		QObject::connect(view, &QObject::destroyed, this, [this, view](QObject *object) {
-			if (view == object) {
-				mView.remove(view);
-				view->removeEventFilter(this);
-			}
-		});
-
-		mFontSizeHandlerBase->updateFontSize(view, iconHeightFactor, callback, true);
-	}
-
-private:
-	FontSizeHandlerBase *mFontSizeHandlerBase;
-	QMap<QAbstractItemView*, FontSizeHandlerViewData> mView;
-	QMap<QWidget*, FontSizeHandlerWidgetData> mWidget;
-};
-
-FontSizeHandlerBase::FontSizeHandlerBase(Type type)
-{
-	mType = type;
-	mObject = nullptr;
-}
-
-FontSizeHandlerBase::~FontSizeHandlerBase()
-{
-	if (mObject) {
-		mObject->deleteLater();
-		mObject = nullptr;
-	}
-}
-
-int FontSizeHandlerBase::getFontSize()
-{
-	switch (mType) {
-	case FONT_SIZE:
-		return Settings->getFontSize();
-
-	case MESSAGE_FONT_SIZE:
-		return Settings->getMessageFontSize();
-	}
-
-	return 0;
-}
-
-void FontSizeHandlerBase::registerFontSize(QWidget *widget, std::function<void(QWidget*, int)> callback)
-{
-	if (!widget) {
-		return;
-	}
-
-	if (!mObject) {
-		mObject = new FontSizeHandlerObject(this);
-	}
-
-	mObject->registerFontSize(widget, callback);
-}
-
-void FontSizeHandlerBase::registerFontSize(QAbstractItemView *view, float iconHeightFactor, std::function<void(QAbstractItemView*, int)> callback)
-{
-	if (!view) {
-		return;
-	}
-
-	if (!mObject) {
-		mObject = new FontSizeHandlerObject(this);
-	}
-
-	mObject->registerFontSize(view, iconHeightFactor, callback);
-}
-
-void FontSizeHandlerBase::updateFontSize(QWidget *widget, std::function<void (QWidget *, int)> callback, bool force)
-{
-	if (!widget) {
-		return;
-	}
-
-	int fontSize = getFontSize();
-	QFont font = widget->font();
-	if (force || font.pointSize() != fontSize) {
-		font.setPointSize(fontSize);
-		widget->setFont(font);
-
-		if (callback) {
-			callback(widget, fontSize);
-		}
-	}
-}
-
-void FontSizeHandlerBase::updateFontSize(QAbstractItemView *view, float iconHeightFactor, std::function<void (QAbstractItemView *, int)> callback, bool force)
-{
-	if (!view) {
-		return;
-	}
-
-	int fontSize = getFontSize();
-	QFont font = view->font();
-	if (force || font.pointSize() != fontSize) {
-		font.setPointSize(fontSize);
-		view->setFont(font);
-
-		if (iconHeightFactor) {
-			QFontMetricsF fontMetrics(font);
-			int iconHeight = fontMetrics.height() * iconHeightFactor;
-			view->setIconSize(QSize(iconHeight, iconHeight));
-		}
-
-		if (callback) {
-			callback(view, fontSize);
-		}
-	}
-}
diff --git a/retroshare-gui/src/util/FontSizeHandler.h b/retroshare-gui/src/util/FontSizeHandler.h
deleted file mode 100644
index bf9c8058b..000000000
--- a/retroshare-gui/src/util/FontSizeHandler.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * util/FontSizeHandler.h                                                      *
- *                                                                             *
- * Copyright (C) 2025, Retroshare Team <retroshare.project@gmail.com>          *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License as              *
- * published by the Free Software Foundation, either version 3 of the          *
- * License, or (at your option) any later version.                             *
- *                                                                             *
- * This program is distributed in the hope that it will be useful,             *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of              *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                *
- * GNU Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#ifndef _FONTSIZEHANDLER_H
-#define _FONTSIZEHANDLER_H
-
-#include <functional>
-
-class QWidget;
-class QAbstractItemView;
-class FontSizeHandlerObject;
-
-// Class to handle font size and message font size setting
-class FontSizeHandlerBase
-{
-	friend class FontSizeHandlerObject;
-
-public:
-	virtual ~FontSizeHandlerBase();
-
-	int getFontSize();
-
-	void registerFontSize(QWidget *widget, std::function<void(QWidget*, int)> callback = nullptr);
-	void registerFontSize(QAbstractItemView *view, float iconHeightFactor = 0.0f, std::function<void(QAbstractItemView*, int)> callback = nullptr);
-
-	void updateFontSize(QWidget *widget, std::function<void(QWidget*, int)> callback = nullptr, bool force = false);
-	void updateFontSize(QAbstractItemView *view, float iconHeightFactor, std::function<void (QAbstractItemView *, int)> callback, bool force = false);
-
-protected:
-	enum Type {
-		FONT_SIZE,
-		MESSAGE_FONT_SIZE
-	};
-
-	FontSizeHandlerBase(Type type);
-
-private:
-	Type mType;
-	FontSizeHandlerObject *mObject;
-};
-
-// Class to handle font size setting
-class FontSizeHandler : public FontSizeHandlerBase
-{
-public:
-	FontSizeHandler() : FontSizeHandlerBase(FONT_SIZE) {}
-};
-
-// Class to handle message font size setting
-class MessageFontSizeHandler : public FontSizeHandlerBase
-{
-public:
-	MessageFontSizeHandler() : FontSizeHandlerBase(MESSAGE_FONT_SIZE) {}
-};
-
-#endif // FONTSIZEHANDLER
diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp
index 7ad0c15e8..6f6eec750 100644
--- a/retroshare-gui/src/util/HandleRichText.cpp
+++ b/retroshare-gui/src/util/HandleRichText.cpp
@@ -31,7 +31,6 @@
 #include "gui/RetroShareLink.h"
 #include "util/ObjectPainter.h"
 #include "util/imageutil.h"
-#include "util/QtVersion.h"
 
 #include "util/rsdebug.h"
 #include "util/rstime.h"
@@ -1253,7 +1252,7 @@ QString RsHtml::makeQuotedText(RSTextBrowser *browser)
 	{
 		text = browser->toPlainText();
 	}
-	QStringList sl = text.split(QRegExp("[\r\n]"),QtSkipEmptyParts);
+	QStringList sl = text.split(QRegExp("[\r\n]"),QString::SkipEmptyParts);
 	text = sl.join("\n> ");
 	text.replace("\n> >","\n>>"); // Don't add space for already quotted lines.
 	text.replace(QChar(-4)," ");//Char used when image on text.
diff --git a/retroshare-gui/src/util/QtVersion.h b/retroshare-gui/src/util/QtVersion.h
index f5e8e9784..d04d226ae 100644
--- a/retroshare-gui/src/util/QtVersion.h
+++ b/retroshare-gui/src/util/QtVersion.h
@@ -21,7 +21,7 @@
 #ifndef QTVERSION_H
 #define QTVERSION_H
 
-// Macros to compile with Qt 4, Qt 5 and Qt 6
+// Macros to compile with Qt 4 and Qt 5
 
 // Renamed QHeaderView::setResizeMode to QHeaderView::setSectionResizeMode
 #if QT_VERSION >= QT_VERSION_CHECK (5, 0, 0)
@@ -43,10 +43,4 @@
 #define QHeaderView_setSectionsMovable(header, movable) header->setMovable(movable);
 #endif
 
-#if QT_VERSION >= QT_VERSION_CHECK (6, 0, 0)
-#define QtSkipEmptyParts Qt::SkipEmptyParts
-#else
-#define QtSkipEmptyParts QString::SkipEmptyParts
-#endif
-
 #endif
diff --git a/retroshare-gui/src/util/RichTextEdit.cpp b/retroshare-gui/src/util/RichTextEdit.cpp
index 020b13db9..9d4596a82 100644
--- a/retroshare-gui/src/util/RichTextEdit.cpp
+++ b/retroshare-gui/src/util/RichTextEdit.cpp
@@ -167,7 +167,7 @@ RichTextEdit::RichTextEdit(QWidget *parent) : QWidget(parent) {
 
     QFontDatabase db;
     foreach(int size, db.standardSizes())
-        f_fontsize->addItem(QString::number(size), size);
+        f_fontsize->addItem(QString::number(size));
 
     connect(f_fontsize, SIGNAL(activated(QString)),
             this, SLOT(textSize(QString)));
@@ -195,9 +195,6 @@ RichTextEdit::RichTextEdit(QWidget *parent) : QWidget(parent) {
 	// check message length
 	connect(f_textedit, SIGNAL(textChanged()), this, SLOT(checkLength()));
 
-    mMessageFontSizeHandler.registerFontSize(f_textedit, [this] (QWidget*, int fontSize) {
-        f_fontsize->setCurrentIndex(f_fontsize->findData(fontSize));
-    });
 }
 
 
diff --git a/retroshare-gui/src/util/RichTextEdit.h b/retroshare-gui/src/util/RichTextEdit.h
index 6e4869838..aae9d20ab 100644
--- a/retroshare-gui/src/util/RichTextEdit.h
+++ b/retroshare-gui/src/util/RichTextEdit.h
@@ -23,7 +23,6 @@
 
 #include <QPointer>
 #include "ui_RichTextEdit.h"
-#include "util/FontSizeHandler.h"
 
 /**
  * @Brief A simple rich-text editor
@@ -94,9 +93,6 @@ signals:
                           ParagraphMonospace };
 
     QPointer<QTextList> m_lastBlockList;
-
-private:
-    MessageFontSizeHandler mMessageFontSizeHandler;
 };
 
 #endif
diff --git a/retroshare-gui/src/util/RichTextEdit.ui b/retroshare-gui/src/util/RichTextEdit.ui
index 5bb57a792..63e624b5e 100644
--- a/retroshare-gui/src/util/RichTextEdit.ui
+++ b/retroshare-gui/src/util/RichTextEdit.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>784</width>
+    <width>703</width>
     <height>312</height>
    </rect>
   </property>
@@ -566,6 +566,7 @@
      <property name="font">
       <font>
        <family>MS Sans Serif</family>
+       <pointsize>9</pointsize>
       </font>
      </property>
      <property name="autoFormatting">
@@ -589,16 +590,16 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>MimeTextEdit</class>
+   <extends>QTextEdit</extends>
+   <header>gui/common/MimeTextEdit.h</header>
+  </customwidget>
   <customwidget>
    <class>RSComboBox</class>
    <extends>QComboBox</extends>
    <header>gui/common/RSComboBox.h</header>
   </customwidget>
-  <customwidget>
-   <class>MimeTextEdit</class>
-   <extends>QTextEdit</extends>
-   <header location="global">gui/common/MimeTextEdit.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>f_textedit</tabstop>
@@ -607,6 +608,7 @@
   <tabstop>f_menu</tabstop>
  </tabstops>
  <resources>
+  <include location="../gui/images.qrc"/>
   <include location="../gui/icons.qrc"/>
  </resources>
  <connections/>
diff --git a/retroshare-gui/src/util/RsAction.cpp b/retroshare-gui/src/util/RsAction.cpp
index a0c38d492..f80fd0293 100644
--- a/retroshare-gui/src/util/RsAction.cpp
+++ b/retroshare-gui/src/util/RsAction.cpp
@@ -20,7 +20,7 @@
 
 #include "util/RsAction.h"
 
-RsAction::RsAction(QObject * parent, std::string rsid)
+RsAction::RsAction(QWidget * parent, std::string rsid)
 	: QAction(parent), RsId(rsid) 
 {
 	connect(this, SIGNAL( triggered( bool ) ), this, SLOT( triggerEvent( bool ) ) );
diff --git a/retroshare-gui/src/util/RsAction.h b/retroshare-gui/src/util/RsAction.h
index b2110428a..d61efc08b 100644
--- a/retroshare-gui/src/util/RsAction.h
+++ b/retroshare-gui/src/util/RsAction.h
@@ -28,7 +28,7 @@ class  RsAction : public QAction {
 	Q_OBJECT
 public:
 
-	RsAction(QObject *parent, std::string rsid);
+	RsAction(QWidget * parent, std::string rsid);
 	RsAction(const QString & text, QObject * parent, std::string rsid);
 	RsAction(const QIcon & icon, const QString & text, QObject * parent , std::string rsid);
 
diff --git a/retroshare-gui/src/util/imageutil.cpp b/retroshare-gui/src/util/imageutil.cpp
index 690872bdb..612387724 100644
--- a/retroshare-gui/src/util/imageutil.cpp
+++ b/retroshare-gui/src/util/imageutil.cpp
@@ -274,9 +274,7 @@ bool ImageUtil::optimizeSizeHtml(QString &html, const QImage& original, QImage &
     if(optimizeSizeBytes(bytearray, original, optimized,has_transparency?"PNG":"JPG",maxPixels, maxBytes))
 	{
 		QByteArray encodedByteArray = bytearray.toBase64();
-		html = "<img src=\"data:image/";
-		html.append(has_transparency ? "png" : "jpeg");
-		html.append(";base64,");
+		html = "<img src=\"data:image/png;base64,";
 		html.append(encodedByteArray);
 		html.append("\">");
 		return true;
diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index 97562c91e..443ca2227 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -10,11 +10,6 @@ project(retroshare-service)
 
 include(CMakeDependentOption)
 
-if(APPLE)
-  include_directories("/usr/local/include") 
-  LINK_DIRECTORIES("/usr/local/lib")
-endif()
-
 set(
 	RS_BIN_INSTALL_DIR
 	"${CMAKE_INSTALL_PREFIX}/bin"
@@ -100,7 +95,7 @@ if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/CMakeLists.txt" )
 else()
 	FetchContent_Declare(
 		libretroshare
-		GIT_REPOSITORY "https://github.com/RetroShare/libretroshare.git"
+		GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
 		GIT_TAG "origin/master"
 		GIT_SHALLOW TRUE
 		GIT_PROGRESS TRUE
@@ -156,7 +151,7 @@ if(RS_WEBUI)
 	else()
 		FetchContent_Declare(
 			webui
-			GIT_REPOSITORY "https://github.com/RetroShare/RSNewWebUI.git"
+			GIT_REPOSITORY "https://gitlab.com/RetroShare/RetroShareWebUI.git"
 			GIT_TAG "origin/master"
 			GIT_SHALLOW TRUE
 			GIT_PROGRESS TRUE
diff --git a/retroshare-service/data/retroshare-service.desktop b/retroshare-service/data/retroshare-service.desktop
index fc8135e05..5d077597b 100644
--- a/retroshare-service/data/retroshare-service.desktop
+++ b/retroshare-service/data/retroshare-service.desktop
@@ -7,4 +7,4 @@ Exec=retroshare-service %U
 Icon=retroshare-service
 Terminal=false
 Type=Application
-Categories=Network;
+Categories=Application;Network;
diff --git a/retroshare-service/src/logo.icns b/retroshare-service/src/logo.icns
deleted file mode 100644
index cb105009d..000000000
Binary files a/retroshare-service/src/logo.icns and /dev/null differ
diff --git a/retroshare-service/src/retroshare-service.pro b/retroshare-service/src/retroshare-service.pro
index 275f868cc..6458e03ed 100644
--- a/retroshare-service/src/retroshare-service.pro
+++ b/retroshare-service/src/retroshare-service.pro
@@ -70,10 +70,6 @@ macx {
 	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
 	LIBS += -lz 
         #LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
-	RC_FILE = $$files($$PWD/logo.icns)
-        mac_icon.files = $$files($$PWD/logo.icns)
-        mac_icon.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += mac_icon
 
 	for(lib, LIB_DIR):exists($$lib/libminiupnpc.a){ LIBS += $$lib/libminiupnpc.a}
 
diff --git a/retroshare-webui b/retroshare-webui
index edfc638a6..dae0c13ef 160000
--- a/retroshare-webui
+++ b/retroshare-webui
@@ -1 +1 @@
-Subproject commit edfc638a6af87d0f60489632416105e1fa13fc4e
+Subproject commit dae0c13ef78aee59a4f1f9e1cdb0127b5e27d256
diff --git a/retroshare.pri b/retroshare.pri
index 98226c686..19dd5434f 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -132,7 +132,7 @@ use_dht_stunner_ext_ip:CONFIG -= no_use_dht_stunner_ext_ip
 
 # To select your MacOsX version append the following assignation to qmake
 # command line "CONFIG+=rs_macos10.11" where 10.11 depends your version
-macx:CONFIG *= rs_macos11.1
+macx:CONFIG *= rs_macos10.11
 rs_macos10.8:CONFIG -= rs_macos10.11
 rs_macos10.9:CONFIG -= rs_macos10.11
 rs_macos10.10:CONFIG -= rs_macos10.11
@@ -182,12 +182,6 @@ rs_deep_files_index_taglib:CONFIG -= no_rs_deep_files_index_taglib
 CONFIG *= no_rs_use_native_dialogs
 rs_use_native_dialogs:CONFIG -= no_rs_use_native_dialogs
 
-# By default, use RNP lib for RFC4880 PGP management. If not, compilation will
-# default to openpgp-sdk, which is old and unmaintained, so probably not very secure.
-CONFIG *= rs_rnplib
-rs_no_rnplib:CONFIG -= rs_rnplib
-rs_no_rnplib:CONFIG += rs_openpgpsdk
-
 # To disable broadcast discovery append the following assignation to qmake
 # command line "CONFIG+=no_rs_broadcast_discovery"
 CONFIG *= rs_broadcast_discovery
@@ -286,7 +280,7 @@ isEmpty(RS_THREAD_LIB):RS_THREAD_LIB = pthread
 #
 #  V07_NON_BACKWARD_COMPATIBLE_CHANGE_002:
 #
-#     What: Use RSA+SHA256 instead of RSA+SHA1 for SSL certificates 
+#     What: Use RSA+SHA256 instead of RSA+SHA1 for PGP certificate signatures
 #
 #     Why:  Sha1 is likely to be prone to primary collisions anytime soon, so it is urgent to turn to a more secure solution.
 #
@@ -296,38 +290,16 @@ isEmpty(RS_THREAD_LIB):RS_THREAD_LIB = pthread
 #
 #    What: Do not hash PGP certificate twice when signing
 #
-#    Why: hasing twice is not per se a security issue, but it makes it harder to change the settings for hashing.
+#  	 Why: hasing twice is not per se a security issue, but it makes it harder to change the settings for hashing.
 #
-#    Backward compat: patched peers cannot connect to non patched peers older than Nov 2017.
+#  	 Backward compat: patched peers cannot connect to non patched peers older than Nov 2017.
 #
 #  V07_NON_BACKWARD_COMPATIBLE_CHANGE_004:
 #
 #    What: Do not probe that GXS tunnels accept fast items. Just assume they do.
-#
 #    Why:  Avoids sending probe packets
-#
 #    BackwardCompat: old RS before Mai 2019 will not be able to distant chat.
 #
-#  V07_NON_BACKWARD_COMPATIBLE_CHANGE_005:
-#
-#    What: Stop accepting certificates signed with sha1 algorithm
-#
-#    Why:  Sha1 has been declared insecure and shouldn't be used anymore. 
-#
-#    BackwardCompat: Retroshare profiles generated before Nov.2024 with openpgp-sdk may still use sha1
-#
-###########################################################################################################################################################
-
-###########################################################################################################################################################
-#
-#  V06_EXPERIMENTAL_CHANGE_001:
-#
-#    What: removes issuer fingerprint from signature subpackets
-#    Why:  This type of subpacket is not part of RFC4880 and not recognised by OpenPGP-SDK
-#    BackwardCompat: old RS before Sept.2024 will not be able to exchange keys
-#    Note: Since signature subpacket 33 is part of the hashed section of the signature, this also invalidates the signature.
-#           Depending on the implementation, certificates with self-signature that miss this subpacket may not be accepted.
-#
 ###########################################################################################################################################################
 
 
@@ -341,7 +313,6 @@ rs_v07_changes {
     DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_002
     DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_003
     DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_004
-    DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_005
     DEFINES += V07_NON_BACKWARD_COMPATIBLE_CHANGE_UNNAMED
 }
 
@@ -485,26 +456,13 @@ defined in command line")
         RS_MINOR_VERSION = $$member(RS_GIT_DESCRIBE_SPLIT, 1)
 
         RS_GIT_DESCRIBE_SPLIT = $$member(RS_GIT_DESCRIBE_SPLIT, 2)
-        RS_GIT_DESCRIBE_SPLIT = $$split(RS_GIT_DESCRIBE_SPLIT, )
+        RS_GIT_DESCRIBE_SPLIT = $$split(RS_GIT_DESCRIBE_SPLIT, -)
 
-        # Split string into mini version (leading numbers) and extra version (string after the numbers)
-        RS_MINI_VERSION =
-        RS_EXTRA_VERSION =
-        for(CHAR, RS_GIT_DESCRIBE_SPLIT) {
-            isEqual(CHAR, 0) | greaterThan(CHAR, 0):lessThan(CHAR, 9) | isEqual(CHAR, 9) {
-                # Number
-                isEmpty(RS_EXTRA_VERSION) {
-                    # Add leading numbers to mini version
-                    RS_MINI_VERSION = $${RS_MINI_VERSION}$${CHAR}
-                } else {
-                    # Add to extra version
-                    RS_EXTRA_VERSION = $${RS_EXTRA_VERSION}$${CHAR}
-                }
-            } else {
-                # Add to extra version
-                RS_EXTRA_VERSION = $${RS_EXTRA_VERSION}$${CHAR}
-            }
-        }
+        RS_MINI_VERSION = $$member(RS_GIT_DESCRIBE_SPLIT, 0)
+
+        RS_GIT_DESCRIBE_SPLIT = $$member(RS_GIT_DESCRIBE_SPLIT, 1, -1)
+
+        RS_EXTRA_VERSION = $$join(RS_GIT_DESCRIBE_SPLIT,-,-)
 
         message("RetroShare version\
 $${RS_MAJOR_VERSION}.$${RS_MINOR_VERSION}.$${RS_MINI_VERSION}$${RS_EXTRA_VERSION}\
@@ -520,18 +478,6 @@ trough qmake command line arguments!")
     }
 }
 
-# Some supportlibs compilation won't start if the intstalled CMAKE verison is >=3.5.
-# Force compilation in that case
-CMAKE_FORCE_MINVERSION=""
-CMAKE_VERSION_SPLIT = $$system(cmake --version)
-CMAKE_VERSION_SPLIT = $$split(CMAKE_VERSION_SPLIT, \\s+)
-CMAKE_VERSION = $$member(CMAKE_VERSION_SPLIT, 2)
-message("Cmake version detected: $${CMAKE_VERSION}")
-versionAtLeast(CMAKE_VERSION, 3.5) {
-    warning("Forcing compilation with CMAKE_POLICY_VERSION_MINIMUM=3.5")
-    CMAKE_FORCE_MINVERSION="-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
-}
-
 gxsdistsync:DEFINES *= RS_USE_GXS_DISTANT_SYNC
 wikipoos:DEFINES *= RS_USE_WIKI
 rs_gxs:DEFINES *= RS_ENABLE_GXS
@@ -734,10 +680,7 @@ android-* {
 # To export all symbols for the plugins on Windows build we need to build
 # libretroshare as shared library. Fix linking error (ld.exe: Error: export
 # ordinal too large) due to too many exported symbols.
-#retroshare_plugins:win32:CONFIG *= libretroshare_shared
-
-# Always build libretroshare on Windows as shared library to be compatible when building with and without plugins
-win32:CONFIG *= libretroshare_shared
+retroshare_plugins:win32:CONFIG *= libretroshare_shared
 
 win32-g++|win32-clang-g++ {
     !isEmpty(EXTERNAL_LIB_DIR) {
@@ -867,9 +810,6 @@ macx-* {
 	QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"
 	QMAKE_LIBDIR += "/usr/local/opt/sqlcipher/lib"
 	QMAKE_LIBDIR += "/usr/local/opt/miniupnpc/lib"
-	INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2"
-	INCLUDEPATH += "/usr/local/opt/libxslt/include"
-	QMAKE_LIBDIR += "/usr/local/opt/libxslt/lib"
 }
 
 # If not yet defined attempt UPnP library autodetection should works at least
@@ -896,19 +836,6 @@ isEmpty(RS_UPNP_LIB) {
     }
 }
 
-rs_openpgpsdk {
-        SUBDIRS += openpgpsdk
-        openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro
-        libretroshare.depends += openpgpsdk
-        message("Using OpenPGP-SDK for PGP")
-}
-
-rs_rnplib {
-        DEFINES += USE_RNP_LIB
-        message("Using RNP lib for PGP")
-}
-
-
 equals(RS_UPNP_LIB, none):RS_UPNP_LIB=
 equals(RS_UPNP_LIB, miniupnpc):DEFINES*=RS_USE_LIBMINIUPNPC
 contains(RS_UPNP_LIB, upnp):DEFINES*=RS_USE_LIBUPNP
diff --git a/supportlibs/cmark b/supportlibs/cmark
index 3460cd809..b9c7a496b 160000
--- a/supportlibs/cmark
+++ b/supportlibs/cmark
@@ -1 +1 @@
-Subproject commit 3460cd809b6dd311b58e92733ece2fc956224fd2
+Subproject commit b9c7a496ba7dd9c3495bae2ff2855899e47b245d
diff --git a/supportlibs/librnp b/supportlibs/librnp
deleted file mode 160000
index ec7811726..000000000
--- a/supportlibs/librnp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ec78117269461b2cdce15a085033a8c6bff6d7e3
diff --git a/supportlibs/libsam3 b/supportlibs/libsam3
index f90555ba4..2226ef0a2 160000
--- a/supportlibs/libsam3
+++ b/supportlibs/libsam3
@@ -1 +1 @@
-Subproject commit f90555ba4d6f9fadb6f0fbb1e2253e13557aad34
+Subproject commit 2226ef0a20a001ec0942be6abe5e909c15447d8e
diff --git a/supportlibs/rapidjson b/supportlibs/rapidjson
index 24b5e7a8b..f54b0e47a 160000
--- a/supportlibs/rapidjson
+++ b/supportlibs/rapidjson
@@ -1 +1 @@
-Subproject commit 24b5e7a8b27f42fa16b96fc70aade9106cf7102f
+Subproject commit f54b0e47a08782a6131cc3d60f94d038fa6e0a51
diff --git a/supportlibs/restbed b/supportlibs/restbed
index 6001a3228..c27c6726d 160000
--- a/supportlibs/restbed
+++ b/supportlibs/restbed
@@ -1 +1 @@
-Subproject commit 6001a322809b5005b8bcccdf593fdda6f0173691
+Subproject commit c27c6726d28c42e2e1b7537ba63eeb23e944789d